--- a/mail/base/content/mailWidgets.xml
+++ b/mail/base/content/mailWidgets.xml
@@ -1672,17 +1672,17 @@
</constructor>
</implementation>
</binding>
<!-- searchoperator - Contains, Is Less than, etc -->
<binding id="searchoperator" name="searchOperator"
extends="chrome://messenger/content/mailWidgets.xml#search-menulist-abstract">
<implementation>
- <field name="searchAttribute">Components.interfaces.nsMsgSearchAttrib.Default</field>
+ <field name="searchAttribute">Ci.nsMsgSearchAttrib.Default</field>
<field name="stringBundle">
<![CDATA[
this.Services.strings.createBundle("chrome://messenger/locale/search-operators.properties")
]]>
</field>
<property name="valueLabel" readonly="true">
<getter>
<![CDATA[
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -2276,19 +2276,19 @@
observes="cmd_createFilterFromPopup"/>
</menupopup>
<menupopup id="copyPopup">
<menuitem id="copyMenuitem"
label="©Cmd.label;"
accesskey="©Cmd.accesskey;"
tooltiptext="©Cmd.label;"
- oncommand="Components.classes['@mozilla.org/widget/clipboardhelper;1']
- .getService(Components.interfaces.nsIClipboardHelper)
- .copyString(window.getSelection().isCollapsed ?
+ oncommand="Cc['@mozilla.org/widget/clipboardhelper;1']
+ .getService(Ci.nsIClipboardHelper)
+ .copyString(window.getSelection().isCollapsed ?
document.popupNode.textContent :
window.getSelection().toString());"/>
<menuitem id="createFilterFromMenuItem" label="&CreateFilterFrom.label;"
accesskey="&CreateFilterFrom.accesskey;"
oncommand="CreateFilter(this.parentNode.triggerNode.parentNode, gMessageDisplay.displayedMessage)"
observes="cmd_createFilterFromPopup"/>
</menupopup>
--- a/mail/base/content/search.xml
+++ b/mail/base/content/search.xml
@@ -96,34 +96,33 @@
<field name="_prefObserver">({
inputSearch: this,
observe: function(subject, topic, data)
{
ChromeUtils.import("resource://gre/modules/Services.jsm");
if (topic == "nsPref:changed") {
- subject.QueryInterface(Components.interfaces.nsIPrefBranch);
+ subject.QueryInterface(Ci.nsIPrefBranch);
switch (data) {
case "mailnews.database.global.indexer.enabled":
this.inputSearch.glodaEnabled =
Services.prefs.getBoolPref(
"mailnews.database.global.indexer.enabled");
this.inputSearch.collapsed = !this.inputSearch.glodaEnabled;
break;
}
}
},
QueryInterface: function(aIID)
{
- if (aIID.equals(Components.interfaces.nsIObserver) ||
- aIID.equals(Components.interfaces.nsISupports))
+ if (aIID.equals(Ci.nsIObserver) || aIID.equals(Ci.nsISupports))
return this;
- throw Components.results.NS_NOINTERFACE;
+ throw Cr.NS_NOINTERFACE;
}
});
</field>
<field name="glodaCompleter">null</field>
<property name="menupopup" readonly="true">
<getter><![CDATA[
return document.getAnonymousElementByAttribute(
this, 'anonid', 'quick-search-menupopup');
--- a/mail/base/content/tabmail.xml
+++ b/mail/base/content/tabmail.xml
@@ -1777,75 +1777,82 @@
this._animateTimer = null;
}
this.arrowScrollbox.removeEventListener("overflow", this);
this.arrowScrollbox.removeEventListener("underflow", this);
]]>
</destructor>
- <field name="tabmail" readonly="true">
+ <field name="tabmail" readonly="true"><![CDATA[
document.getElementById("tabmail");
+ ]]>
</field>
- <field name="tabbox" readonly="true">
+ <field name="tabbox" readonly="true"><![CDATA[
document.getAnonymousElementByAttribute(this, "anonid", "tabbox");
+ ]]>
</field>
<field name="arrowScrollboxWidth">0</field>
- <field name="arrowScrollbox">
+ <field name="arrowScrollbox"><![CDATA[
document.getAnonymousElementByAttribute(this, "anonid", "arrowscrollbox");
+ ]]>
</field>
- <field name="arrowScrollboxClosebutton">
+ <field name="arrowScrollboxClosebutton"><![CDATA[
document.getAnonymousElementByAttribute(this, "anonid", "tabstrip-closebutton");
+ ]]>
</field>
- <field name="mToolbar">
+ <field name="mToolbar"><![CDATA[
document.getElementById(this.getAttribute("tabtoolbar"));
+ ]]>
</field>
- <field name="mCollapseToolbar">
+ <field name="mCollapseToolbar"><![CDATA[
document.getElementById(this.getAttribute("collapsetoolbar"));
+ ]]>
</field>
- <field name="_prefObserver">({
+ <field name="_prefObserver"><![CDATA[
+ ({
tabbox: this,
observe: function(subject, topic, data)
{
if (topic == "nsPref:changed") {
- subject.QueryInterface(Components.interfaces.nsIPrefBranch);
+ subject.QueryInterface(Ci.nsIPrefBranch);
switch (data) {
case "mail.tabs.closeButtons":
this.tabbox.mCloseButtons = subject.getIntPref("mail.tabs.closeButtons");
this.tabbox._updateCloseButtons();
break;
case "mail.tabs.autoHide":
this.tabbox.mAutoHide = subject.getBoolPref("mail.tabs.autoHide");
break;
}
}
},
QueryInterface: function(aIID)
{
- if (aIID.equals(Components.interfaces.nsIObserver) ||
- aIID.equals(Components.interfaces.nsISupports))
+ if (aIID.equals(Ci.nsIObserver) || aIID.equals(Ci.nsISupports))
return this;
- throw Components.results.NS_NOINTERFACE;
+ throw Cr.NS_NOINTERFACE;
}
});
+ ]]>
</field>
- <field name="_tabDropIndicator">
- document.getAnonymousElementByAttribute(
- this,
- "anonid", "tab-drop-indicator");
+ <field name="_tabDropIndicator"><![CDATA[
+ document.getAnonymousElementByAttribute(this, "anonid",
+ "tab-drop-indicator");
+ ]]>
</field>
<field name="_dragOverDelay">350</field>
<field name="_dragTime">0</field>
<field name="mTabMinWidth">100</field>
<field name="mTabMaxWidth">250</field>
<field name="mTabClipWidth">140</field>
--- a/mail/components/cloudfile/nsIMsgCloudFileProvider.idl
+++ b/mail/components/cloudfile/nsIMsgCloudFileProvider.idl
@@ -77,17 +77,17 @@ interface nsIMsgCloudFileProvider : nsIS
* process of creating one. There will probably have to be some sort of
* validation on the part of the user before the account is created.
* If not, this will throw NS_ERROR_NOT_IMPLEMENTED.
*
* If the REST call succeeds, aCallback.onStopRequest will get called back
* with an http status. Generally, status between 200 and 300 is OK,
* otherwise, an error occurred which is * probably specific to the provider.
* If the request fails completely, onStopRequest will get called with
- * Components.results.NS_ERROR_FAILURE
+ * Cr.NS_ERROR_FAILURE
* @throws nsIMsgCloudFileProvider.offlineErr if we are offline.
*/
void createNewAccount(in ACString aEmailAddress, in ACString aPassword,
in ACString aFirstName, in ACString aLastName,
in nsIRequestObserver aCallback);
void createExistingAccount(in nsIRequestObserver aCallback);
--- a/mail/components/compose/content/MsgComposeCommands.js
+++ b/mail/components/compose/content/MsgComposeCommands.js
@@ -5496,17 +5496,17 @@ nsAttachmentOpener.prototype =
doContent: function(contentType, isContentPreferred, request, contentHandler)
{
// If we came here to display an attached message, make sure we provide a type.
if (/[?&]part=/i.test(request.URI.query)) {
let newQuery = request.URI.query + "&type=message/rfc822";
request.URI = request.URI.mutate().setQuery(newQuery).finalize();
}
let newHandler = Cc["@mozilla.org/uriloader/content-handler;1?type=application/x-message-display"]
- .createInstance(Components.interfaces.nsIContentHandler);
+ .createInstance(Ci.nsIContentHandler);
newHandler.handleContent("application/x-message-display", this, request);
return true;
},
isPreferred: function(contentType, desiredContentType)
{
if (contentType == "message/rfc822")
return true;
--- a/mail/test/mozmill/shared-modules/test-mock-object-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-mock-object-helpers.js
@@ -53,17 +53,17 @@ MockObjectRegisterer.prototype = {
* The ContractID of the component to replace, for example
* "@mozilla.org/filepicker;1".
*
* @param aReplacementCtor
* The constructor function for the JavaScript object that will be
* created every time createInstance is called. This object must
* implement QueryInterface and provide the XPCOM interfaces required by
* the specified ContractID (for example
- * Components.interfaces.nsIFilePicker).
+ * Ci.nsIFilePicker).
*/
function MockObjectReplacer(aContractID, aReplacementCtor) {
this._contractID = aContractID;
this._replacementCtor = aReplacementCtor;
}
MockObjectReplacer.prototype = {
--- a/mail/test/resources/jsbridge/jsbridge/__init__.py
+++ b/mail/test/resources/jsbridge/jsbridge/__init__.py
@@ -47,17 +47,17 @@ from jsobjects import JSObject
import mozrunner
settings_env = 'JSBRIDGE_SETTINGS_FILE'
parent = os.path.abspath(os.path.dirname(__file__))
extension_path = os.path.join(parent, 'extension')
-window_string = "Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('')"
+window_string = "Cc['@mozilla.org/appshell/window-mediator;1'].getService(Ci.nsIWindowMediator).getMostRecentWindow('')"
wait_to_create_timeout = 60
def wait_and_create_network(host, port, timeout=wait_to_create_timeout):
ttl = 0
while ttl < timeout:
try:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -171,16 +171,9 @@ class CLI(mozrunner.CLI):
port = int(self.options.port)
host = '127.0.0.1'
self.back_channel, self.bridge = wait_and_create_network(host, port, timeout)
def cli():
CLI().run()
def getBrowserWindow(bridge):
- return JSObject(bridge, "Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('')")
-
-
-
-
-
-
-
+ return JSObject(bridge, "Cc['@mozilla.org/appshell/window-mediator;1'].getService(Ci.nsIWindowMediator).getMostRecentWindow('')")
--- a/mail/test/resources/mozmill/mozmill/extension/content/rec.js
+++ b/mail/test/resources/mozmill/mozmill/extension/content/rec.js
@@ -277,18 +277,17 @@ RecorderConnector.prototype.on = functio
}
var mmWindows = utils.getWindows('navigator:browser');
if (mmWindows.length != 0){
mmWindows[0].focus();
}
var observerService =
- Components.classes["@mozilla.org/observer-service;1"]
- .getService(Components.interfaces.nsIObserverService);
+ Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
//Attach the new window open listener
observerService.addObserver(this.observer, "toplevel-window-ready", false);
currentRecorderArray = [];
};
RecorderConnector.prototype.off = function() {
@@ -304,18 +303,17 @@ RecorderConnector.prototype.off = functi
this.unbindListeners(win);
}
var r = getRecordedScript(currentRecorderArray);
editor.setContent(r);
currentRecorderArray = [];
//remove new window listener
var observerService =
- Components.classes["@mozilla.org/observer-service;1"]
- .getService(Components.interfaces.nsIObserverService);
+ Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
try { observerService.removeObserver(this.observer, "toplevel-window-ready"); }
catch(err){}
};
var MozMillrec = new RecorderConnector();
// Scoping bug workarounds
var enableRec = function () {
deleted file mode 100644
--- a/mail/test/resources/mozmill/patches/eventUtils.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-diff --git a/mozmill/mozmill/extension/resource/stdlib/EventUtils.js b/mozmill/mozmill/extension/resource/stdlib/EventUtils.js
-index 27fbbc7..0329d47 100644
---- a/mozmill/mozmill/extension/resource/stdlib/EventUtils.js
-+++ b/mozmill/mozmill/extension/resource/stdlib/EventUtils.js
-@@ -1,3 +1,24 @@
-+// Export all available functions for Mozmill
-+var EXPORTED_SYMBOLS = ["sendMouseEvent", "sendChar", "sendString", "sendKey",
-+ "__doEventDispatch", "_parseModifiers", "synthesizeMouse",
-+ "synthesizeMouseScroll", "synthesizeKey", "_expectEvent",
-+ "_checkExpectedEvent", "synthesizeMouseExpectEvent",
-+ "synthesizeDragStart", "synthesizeDrop",
-+ "disableNonTestMouseEvents", "_getDOMWindowUtils",
-+ "synthesizeComposition", "synthesizeText",
-+ "synthesizeQuerySelectedText", "synthesizeQueryTextContent",
-+ "synthesizeQueryCaretRect", "synthesizeQueryTextRect",
-+ "synthesizeQueryEditorRect", "synthesizeCharAtPoint",
-+ "synthesizeSelectionSet"];
-+
-+/**
-+ * Get the array with available key events
-+ */
-+function getKeyEvent(aWindow) {
-+ var win = aWindow.wrappedJSObject ? aWindow.wrappedJSObject : aWindow;
-+ return win.KeyEvent;
-+}
-+
- /**
- * EventUtils provides some utility methods for creating and sending DOM events.
- * Current methods:
-@@ -29,9 +50,6 @@ function sendMouseEvent(aEvent, aTarget, aWindow) {
- aTarget = aWindow.document.getElementById(aTarget);
- }
-
-- // For events to trigger the UA's default actions they need to be "trusted"
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalBrowserWrite');
--
- var event = aWindow.document.createEvent('MouseEvent');
-
- var typeArg = aEvent.type;
-@@ -107,14 +125,17 @@ function sendString(aStr, aTarget) {
- * Returns true if the keypress event was accepted (no calls to preventDefault
- * or anything like that), false otherwise.
- */
--function sendKey(aKey, aTarget) {
-+function sendKey(aKey, aTarget, aWindow) {
-+ if (!aWindow)
-+ aWindow = window;
-+
- keyName = "DOM_VK_" + aKey.toUpperCase();
-
-- if (!KeyEvent[keyName]) {
-+ if (!getKeyEvent(aWindow)[keyName]) {
- throw "Unknown key: " + keyName;
- }
-
-- return __doEventDispatch(aTarget, 0, KeyEvent[keyName], false);
-+ return __doEventDispatch(aTarget, 0, getKeyEvent(aWindow)[keyName], false);
- }
-
- /**
-@@ -130,9 +151,6 @@ function __doEventDispatch(aTarget, aCharCode, aKeyCode, aHasShift) {
- aTarget = "target";
- }
-
-- // Make our events trusted
-- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
--
- var event = document.createEvent("KeyEvents");
- event.initKeyEvent("keydown", true, true, document.defaultView,
- false, false, aHasShift, false,
-@@ -171,6 +189,10 @@ function __doEventDispatch(aTarget, aCharCode, aKeyCode, aHasShift) {
- */
- function _parseModifiers(aEvent)
- {
-+ var hwindow = Components.classes["@mozilla.org/appshell/appShellService;1"]
-+ .getService(Components.interfaces.nsIAppShellService)
-+ .hiddenDOMWindow;
-+
- const masks = Components.interfaces.nsIDOMNSEvent;
- var mval = 0;
- if (aEvent.shiftKey)
-@@ -182,8 +204,8 @@ function _parseModifiers(aEvent)
- if (aEvent.metaKey)
- mval |= masks.META_MASK;
- if (aEvent.accelKey)
-- mval |= (navigator.platform.indexOf("Mac") >= 0) ? masks.META_MASK :
-- masks.CONTROL_MASK;
-+ mval |= (hwindow.navigator.platform.indexOf("Mac") >= 0) ? masks.META_MASK :
-+ masks.CONTROL_MASK;
-
- return mval;
- }
-@@ -203,8 +225,6 @@ function _parseModifiers(aEvent)
- */
- function synthesizeMouse(aTarget, aOffsetX, aOffsetY, aEvent, aWindow)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- if (!aWindow)
- aWindow = window;
-
-@@ -253,8 +273,6 @@ function synthesizeMouse(aTarget, aOffsetX, aOffsetY, aEvent, aWindow)
- */
- function synthesizeMouseScroll(aTarget, aOffsetX, aOffsetY, aEvent, aWindow)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- if (!aWindow)
- aWindow = window;
-
-@@ -302,8 +320,6 @@ function synthesizeMouseScroll(aTarget, aOffsetX, aOffsetY, aEvent, aWindow)
- */
- function synthesizeKey(aKey, aEvent, aWindow)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- if (!aWindow)
- aWindow = window;
-
-@@ -312,7 +328,7 @@ function synthesizeKey(aKey, aEvent, aWindow)
- if (utils) {
- var keyCode = 0, charCode = 0;
- if (aKey.indexOf("VK_") == 0)
-- keyCode = KeyEvent["DOM_" + aKey];
-+ keyCode = getKeyEvent(aWindow)["DOM_" + aKey];
- else
- charCode = aKey.charCodeAt(0);
-
-@@ -555,8 +571,6 @@ function synthesizeDrop(srcElement, destElement, dragData, dropEffect, aWindow)
-
- function disableNonTestMouseEvents(aDisable)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- var utils =
- window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
- getInterface(Components.interfaces.nsIDOMWindowUtils);
-@@ -582,8 +596,6 @@ function _getDOMWindowUtils(aWindow)
- */
- function synthesizeComposition(aIsCompositionStart, aWindow)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- var utils = _getDOMWindowUtils(aWindow);
- if (!utils) {
- return;
-@@ -635,8 +647,6 @@ function synthesizeComposition(aIsCompositionStart, aWindow)
- */
- function synthesizeText(aEvent, aWindow)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- var utils = _getDOMWindowUtils(aWindow);
- if (!utils) {
- return;
-@@ -685,8 +695,6 @@ function synthesizeText(aEvent, aWindow)
- */
- function synthesizeQuerySelectedText(aWindow)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- var utils = _getDOMWindowUtils(aWindow);
- if (!utils) {
- return nullptr;
-@@ -707,8 +715,6 @@ function synthesizeQuerySelectedText(aWindow)
- */
- function synthesizeQueryTextContent(aOffset, aLength, aWindow)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- var utils = _getDOMWindowUtils(aWindow);
- if (!utils) {
- return nullptr;
-@@ -728,8 +734,6 @@ function synthesizeQueryTextContent(aOffset, aLength, aWindow)
- */
- function synthesizeQueryCaretRect(aOffset, aWindow)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- var utils = _getDOMWindowUtils(aWindow);
- if (!utils) {
- return nullptr;
-@@ -751,8 +755,6 @@ function synthesizeQueryCaretRect(aOffset, aWindow)
- */
- function synthesizeQueryTextRect(aOffset, aLength, aWindow)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- var utils = _getDOMWindowUtils(aWindow);
- if (!utils) {
- return nullptr;
-@@ -770,8 +772,6 @@ function synthesizeQueryTextRect(aOffset, aLength, aWindow)
- */
- function synthesizeQueryEditorRect(aWindow)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- var utils = _getDOMWindowUtils(aWindow);
- if (!utils) {
- return nullptr;
-@@ -789,8 +789,6 @@ function synthesizeQueryEditorRect(aWindow)
- */
- function synthesizeCharAtPoint(aX, aY, aWindow)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- var utils = _getDOMWindowUtils(aWindow);
- if (!utils) {
- return nullptr;
-@@ -813,8 +811,6 @@ function synthesizeCharAtPoint(aX, aY, aWindow)
- */
- function synthesizeSelectionSet(aOffset, aLength, aReverse, aWindow)
- {
-- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
--
- var utils = _getDOMWindowUtils(aWindow);
- if (!utils) {
- return false;
--- a/mailnews/addrbook/content/abDragDrop.js
+++ b/mailnews/addrbook/content/abDragDrop.js
@@ -165,18 +165,17 @@ var abDirTreeObserver = {
return false;
// XXX Due to bug 373125/bug 349044 we can't specify a default action,
// so we default to move and this means that the user would have to press
// ctrl to copy which most users don't realise.
//
// If target directory is a mailing list, then only allow copies.
// if (targetDirectory.isMailList &&
- // dragSession.dragAction != Components.interfaces.
- // nsIDragService.DRAGDROP_ACTION_COPY)
+ // dragSession.dragAction != Ci.nsIDragService.DRAGDROP_ACTION_COPY)
//return false;
var srcDirectory = GetDirectoryFromURI(srcURI);
// Only allow copy from read-only directories.
if (srcDirectory.readOnly &&
dragSession.dragAction != Ci.
nsIDragService.DRAGDROP_ACTION_COPY)
--- a/mailnews/base/search/content/FilterEditor.js
+++ b/mailnews/base/search/content/FilterEditor.js
@@ -288,17 +288,17 @@ function initializeFilterTypeSelector()
menuitemBeforePlugins: document.getElementById("runBeforePlugins"),
menuitemAfterPlugins: document.getElementById("runAfterPlugins"),
checkBoxArchive: document.getElementById("runArchive"),
checkBoxOutgoing: document.getElementById("runOutgoing"),
/**
* Returns the currently set filter type (checkboxes) in terms
- * of a Components.interfaces.nsMsgFilterType value.
+ * of a Ci.nsMsgFilterType value.
*/
getType: function()
{
let type = nsMsgFilterType.None;
if (this.checkBoxManual.checked)
type |= nsMsgFilterType.Manual;
@@ -323,17 +323,17 @@ function initializeFilterTypeSelector()
return type;
},
/**
* Sets the checkboxes to represent the filter type passed in.
*
* @param aType the filter type to set in terms
- * of Components.interfaces.nsMsgFilterType values.
+ * of Ci.nsMsgFilterType values.
*/
setType: function(aType)
{
// If there is no type (event) requested, force "when manually run"
if (aType == nsMsgFilterType.None)
aType = nsMsgFilterType.Manual;
this.checkBoxManual.checked = aType & nsMsgFilterType.Manual;
--- a/mailnews/db/gloda/content/glodacomplete.xml
+++ b/mailnews/db/gloda/content/glodacomplete.xml
@@ -34,17 +34,17 @@
unEscapeURIForUI("UTF-8", controller.getValueAt(this._currentIndex));
// Unlike our superclass, we create nodes every time because we have
// heterogeneous results and we cannot rely on the XBL bindings to
// to change fast enough.
item = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "richlistitem");
var glodaCompleter = Cc["@mozilla.org/autocomplete/search;1?name=gloda"].
- getService(). //Components.interfaces.nsIAutoCompleteSearch)
+ getService(). //Ci.nsIAutoCompleteSearch)
wrappedJSObject;
var result = glodaCompleter.curResult;
// set these attributes before we set the class
// so that we can use them from the contructor
var row = result.getObjectAt(this._currentIndex);
var obj = row.item;
item.setAttribute("text", trimmedSearchString);
--- a/mailnews/db/gloda/modules/index_msg.js
+++ b/mailnews/db/gloda/modules/index_msg.js
@@ -27,17 +27,17 @@ ChromeUtils.import("resource:///modules/
ChromeUtils.import("resource:///modules/gloda/gloda.js");
ChromeUtils.import("resource:///modules/gloda/collection.js");
ChromeUtils.import("resource:///modules/gloda/connotent.js");
ChromeUtils.import("resource:///modules/gloda/indexer.js");
ChromeUtils.import("resource:///modules/gloda/mimemsg.js");
-// Components.results does not have mailnews error codes!
+// Cr does not have mailnews error codes!
var NS_MSG_ERROR_FOLDER_SUMMARY_OUT_OF_DATE = 0x80550005;
var GLODA_MESSAGE_ID_PROPERTY = "gloda-id";
/**
* Message header property to track dirty status; one of
* |GlodaIndexer.kMessageClean|, |GlodaIndexer.kMessageDirty|,
* |GlodaIndexer.kMessageFilthy|.
*/
--- a/mailnews/db/gloda/modules/log4moz.js
+++ b/mailnews/db/gloda/modules/log4moz.js
@@ -668,17 +668,17 @@ TimeAwareMemoryBucketAppender.prototype
function ConsoleAppender(formatter) {
this._name = "ConsoleAppender";
this._formatter = formatter;
}
ConsoleAppender.prototype = {
__proto__: Appender.prototype,
- // override to send Error and higher level messages to Components.utils.reportError()
+ // override to send Error and higher level messages to Cu.reportError()
append: function CApp_append(message) {
let stringMessage = this._formatter.format(message);
if (message.level > Log4Moz.Level.Warn) {
Cu.reportError(stringMessage);
}
this.doAppend(stringMessage);
},
