Rename the contract ids of XPCOM components living in chat/ to names that are suitable for use in Thunderbird (@instantbird.org/purple -> @mozilla.org/chat).
authorFlorian Quèze <florian@instantbird.org>
Thu, 26 Jan 2012 19:02:17 +0100
changeset 18526 a0e8ee46904ca46db1420aae673a190399bfd804
parent 18525 8a5c9b35ed654bffae73b833f9f8d0288475cf1c
child 18527 b5dea6012482a9cba299cbf8e2cf99ada87ff25e
push id1103
push usermbanner@mozilla.com
push dateTue, 18 Mar 2014 07:44:06 +0000
treeherdercomm-beta@50c6279a0af0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
Rename the contract ids of XPCOM components living in chat/ to names that are suitable for use in Thunderbird (@instantbird.org/purple -> @mozilla.org/chat).
chat/components/public/imICommandsService.idl
chat/components/src/imAccounts.js
chat/components/src/imAccounts.manifest
chat/components/src/imCommands.js
chat/components/src/imCommands.manifest
chat/components/src/imContacts.js
chat/components/src/imContacts.manifest
chat/components/src/imConversations.js
chat/components/src/imConversations.manifest
chat/components/src/imCore.js
chat/components/src/imCore.manifest
chat/modules/imServices.jsm
chat/modules/jsProtoHelper.jsm
chat/protocols/facebook/facebook.manifest
chat/protocols/gtalk/gtalk.manifest
chat/protocols/jsTest/jsTestProtocol.manifest
chat/protocols/twitter/twitter.manifest
chat/protocols/xmpp/xmpp.manifest
im/modules/ibCore.jsm
--- a/chat/components/public/imICommandsService.idl
+++ b/chat/components/public/imICommandsService.idl
@@ -101,10 +101,10 @@ interface imICommandsService: nsISupport
   // The aConversation parameters is required to execute protocol specific
   // commands. Application global commands will work without it.
   boolean executeCommand(in AUTF8String aMessage,
                          [optional] in prplIConversation aConversation);
 };
 
 %{ C++
 #define IM_COMMANDS_SERVICE_CONTRACTID \
-  "@instantbird.org/purple/commands-service;1"
+  "@mozilla.org/chat/commands-service;1"
 %}
--- a/chat/components/src/imAccounts.js
+++ b/chat/components/src/imAccounts.js
@@ -938,12 +938,12 @@ AccountsService.prototype = {
     let list = this._accountList;
     this._accountList =
       list.split(",").filter(function (k) k.trim() != aAccountId).join(",");
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.imIAccountsService]),
   classDescription: "Accounts",
   classID: Components.ID("{a94b5427-cd8d-40cf-b47e-b67671953e70}"),
-  contractID: "@instantbird.org/purple/accounts-service;1"
+  contractID: "@mozilla.org/chat/accounts-service;1"
 };
 
 const NSGetFactory = XPCOMUtils.generateNSGetFactory([AccountsService]);
--- a/chat/components/src/imAccounts.manifest
+++ b/chat/components/src/imAccounts.manifest
@@ -1,2 +1,2 @@
 component {a94b5427-cd8d-40cf-b47e-b67671953e70} imAccounts.js
-contract @instantbird.org/purple/accounts-service;1 {a94b5427-cd8d-40cf-b47e-b67671953e70}
+contract @mozilla.org/chat/accounts-service;1 {a94b5427-cd8d-40cf-b47e-b67671953e70}
--- a/chat/components/src/imCommands.js
+++ b/chat/components/src/imCommands.js
@@ -253,12 +253,12 @@ CommandsService.prototype = {
     // cmdArray contains commands sorted by priority, attempt to apply
     // them in order until one succeeds.
     return cmdArray.some(function (aCmd) aCmd.run(args, aConversation));
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.imICommandsService]),
   classDescription: "Commands",
   classID: Components.ID("{7cb20c68-ccc8-4a79-b6f1-0b4771ed6c23}"),
-  contractID: "@instantbird.org/purple/commands-service;1"
+  contractID: "@mozilla.org/chat/commands-service;1"
 };
 
 const NSGetFactory = XPCOMUtils.generateNSGetFactory([CommandsService]);
--- a/chat/components/src/imCommands.manifest
+++ b/chat/components/src/imCommands.manifest
@@ -1,2 +1,2 @@
 component {7cb20c68-ccc8-4a79-b6f1-0b4771ed6c23} imCommands.js
-contract @instantbird.org/purple/commands-service;1 {7cb20c68-ccc8-4a79-b6f1-0b4771ed6c23}
+contract @mozilla.org/chat/commands-service;1 {7cb20c68-ccc8-4a79-b6f1-0b4771ed6c23}
--- a/chat/components/src/imContacts.js
+++ b/chat/components/src/imContacts.js
@@ -169,17 +169,17 @@ TagsService.prototype = {
   get otherContactsTag() {
     otherContactsTag._initContacts();
     return otherContactsTag;
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.imITagsService]),
   classDescription: "Tags",
   classID: Components.ID("{1fa92237-4303-4384-b8ac-4e65b50810a5}"),
-  contractID: "@instantbird.org/purple/tags-service;1"
+  contractID: "@mozilla.org/chat/tags-service;1"
 };
 
 // TODO move into the tagsService
 var Tags = [];
 var TagsById = { };
 
 function Tag(aId, aName) {
   this._id = aId;
@@ -1407,13 +1407,13 @@ ContactsService.prototype = {
                                        "WHERE account_id = :accountId");
     statement.params.accountId = aId;
     statement.execute();
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.imIContactsService]),
   classDescription: "Contacts",
   classID: Components.ID("{8c3725dd-ee26-489d-8135-736015af8c7f}"),
-  contractID: "@instantbird.org/purple/contacts-service;1"
+  contractID: "@mozilla.org/chat/contacts-service;1"
 };
 
 const NSGetFactory = XPCOMUtils.generateNSGetFactory([ContactsService,
                                                       TagsService]);
--- a/chat/components/src/imContacts.manifest
+++ b/chat/components/src/imContacts.manifest
@@ -1,4 +1,4 @@
 component {8c3725dd-ee26-489d-8135-736015af8c7f} imContacts.js
-contract @instantbird.org/purple/contacts-service;1 {8c3725dd-ee26-489d-8135-736015af8c7f}
+contract @mozilla.org/chat/contacts-service;1 {8c3725dd-ee26-489d-8135-736015af8c7f}
 component {1fa92237-4303-4384-b8ac-4e65b50810a5} imContacts.js
-contract @instantbird.org/purple/tags-service;1 {1fa92237-4303-4384-b8ac-4e65b50810a5}
+contract @mozilla.org/chat/tags-service;1 {1fa92237-4303-4384-b8ac-4e65b50810a5}
--- a/chat/components/src/imConversations.js
+++ b/chat/components/src/imConversations.js
@@ -454,12 +454,12 @@ ConversationsService.prototype = {
           conv.isChat == aIsChat)
         return conv;
     return null;
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.imIConversationsService]),
   classDescription: "Conversations",
   classID: Components.ID("{b2397cd5-c76d-4618-8410-f344c7c6443a}"),
-  contractID: "@instantbird.org/purple/conversations-service;1"
+  contractID: "@mozilla.org/chat/conversations-service;1"
 };
 
 const NSGetFactory = XPCOMUtils.generateNSGetFactory([ConversationsService]);
--- a/chat/components/src/imConversations.manifest
+++ b/chat/components/src/imConversations.manifest
@@ -1,2 +1,2 @@
 component {b2397cd5-c76d-4618-8410-f344c7c6443a} imConversations.js
-contract @instantbird.org/purple/conversations-service;1 {b2397cd5-c76d-4618-8410-f344c7c6443a}
+contract @mozilla.org/chat/conversations-service;1 {b2397cd5-c76d-4618-8410-f344c7c6443a}
--- a/chat/components/src/imCore.js
+++ b/chat/components/src/imCore.js
@@ -369,12 +369,12 @@ CoreService.prototype = {
 
     this._protos[aPrplId] = proto;
     return proto;
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.imICoreService]),
   classDescription: "Core",
   classID: Components.ID("{073f5953-853c-4a38-bd81-255510c31c2e}"),
-  contractID: "@instantbird.org/purple/core-service;1"
+  contractID: "@mozilla.org/chat/core-service;1"
 };
 
 const NSGetFactory = XPCOMUtils.generateNSGetFactory([CoreService]);
--- a/chat/components/src/imCore.manifest
+++ b/chat/components/src/imCore.manifest
@@ -1,2 +1,2 @@
 component {073f5953-853c-4a38-bd81-255510c31c2e} imCore.js
-contract @instantbird.org/purple/core-service;1 {073f5953-853c-4a38-bd81-255510c31c2e}
+contract @mozilla.org/chat/core-service;1 {073f5953-853c-4a38-bd81-255510c31c2e}
--- a/chat/modules/imServices.jsm
+++ b/chat/modules/imServices.jsm
@@ -36,28 +36,28 @@
  * ***** END LICENSE BLOCK ***** */
 
 let EXPORTED_SYMBOLS = ["Services"];
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(Services, "accounts",
-                                   "@instantbird.org/purple/accounts-service;1",
+                                   "@mozilla.org/chat/accounts-service;1",
                                    "imIAccountsService");
 XPCOMUtils.defineLazyServiceGetter(Services, "core",
-                                   "@instantbird.org/purple/core-service;1",
+                                   "@mozilla.org/chat/core-service;1",
                                    "imICoreService");
 XPCOMUtils.defineLazyServiceGetter(Services, "cmd",
-                                   "@instantbird.org/purple/commands-service;1",
+                                   "@mozilla.org/chat/commands-service;1",
                                    "imICommandsService");
 XPCOMUtils.defineLazyServiceGetter(Services, "contacts",
-                                   "@instantbird.org/purple/contacts-service;1",
+                                   "@mozilla.org/chat/contacts-service;1",
                                    "imIContactsService");
 XPCOMUtils.defineLazyServiceGetter(Services, "conversations",
-                                   "@instantbird.org/purple/conversations-service;1",
+                                   "@mozilla.org/chat/conversations-service;1",
                                    "imIConversationsService");
 XPCOMUtils.defineLazyServiceGetter(Services, "tags",
-                                   "@instantbird.org/purple/tags-service;1",
+                                   "@mozilla.org/chat/tags-service;1",
                                    "imITagsService");
 XPCOMUtils.defineLazyServiceGetter(Services, "logs",
                                    "@instantbird.org/logger;1",
                                    "imILogger");
--- a/chat/modules/jsProtoHelper.jsm
+++ b/chat/modules/jsProtoHelper.jsm
@@ -730,17 +730,17 @@ const GenericProtocolPrototype = {
   get imagesInIM() false,
   get passwordOptional() false,
   get usePointSize() true,
   get registerNoScreenName() false,
   get slashCommandsNative() false,
   get usePurpleProxy() false,
 
   get classDescription() this.name + " Protocol",
-  get contractID() "@instantbird.org/purple/" + this.normalizedName + ";1"
+  get contractID() "@mozilla.org/chat/" + this.normalizedName + ";1"
 };
 
 function ForwardAccount(aBaseAccount)
 {
   this._init(aBaseAccount);
 }
 ForwardAccount.prototype = ForwardAccountPrototype;
 
--- a/chat/protocols/facebook/facebook.manifest
+++ b/chat/protocols/facebook/facebook.manifest
@@ -1,3 +1,3 @@
 component {1d1d0bc5-610c-472f-b2cb-4b89857d80dc} facebook.js
-contract @instantbird.org/purple/facebook;1 {1d1d0bc5-610c-472f-b2cb-4b89857d80dc}
-category im-protocol-plugin prpl-facebook @instantbird.org/purple/facebook;1
+contract @mozilla.org/chat/facebook;1 {1d1d0bc5-610c-472f-b2cb-4b89857d80dc}
+category im-protocol-plugin prpl-facebook @mozilla.org/chat/facebook;1
--- a/chat/protocols/gtalk/gtalk.manifest
+++ b/chat/protocols/gtalk/gtalk.manifest
@@ -1,3 +1,3 @@
 component {38a224c1-6748-49a9-8ab2-efc362b1000d} gtalk.js
-contract @instantbird.org/purple/gtalk;1 {38a224c1-6748-49a9-8ab2-efc362b1000d}
-category im-protocol-plugin prpl-gtalk @instantbird.org/purple/gtalk;1
+contract @mozilla.org/chat/gtalk;1 {38a224c1-6748-49a9-8ab2-efc362b1000d}
+category im-protocol-plugin prpl-gtalk @mozilla.org/chat/gtalk;1
--- a/chat/protocols/jsTest/jsTestProtocol.manifest
+++ b/chat/protocols/jsTest/jsTestProtocol.manifest
@@ -1,6 +1,6 @@
 component {a0774c5a-4aea-458b-9fbc-8d3cbf1a4630} jsTestProtocol.js
-contract @instantbird.org/purple/jstest;1 {a0774c5a-4aea-458b-9fbc-8d3cbf1a4630}
-category im-protocol-plugin prpl-jstest @instantbird.org/purple/jstest;1
+contract @mozilla.org/chat/jstest;1 {a0774c5a-4aea-458b-9fbc-8d3cbf1a4630}
+category im-protocol-plugin prpl-jstest @mozilla.org/chat/jstest;1
 component {88795348-8a4b-4018-890d-5314cb08ec4d} jsTestProtocol.js
-contract @instantbird.org/purple/override;1 {88795348-8a4b-4018-890d-5314cb08ec4d}
-category im-protocol-plugin prpl-override @instantbird.org/purple/override;1
+contract @mozilla.org/chat/override;1 {88795348-8a4b-4018-890d-5314cb08ec4d}
+category im-protocol-plugin prpl-override @mozilla.org/chat/override;1
--- a/chat/protocols/twitter/twitter.manifest
+++ b/chat/protocols/twitter/twitter.manifest
@@ -1,3 +1,3 @@
 component {31082ff6-1de8-422b-ab60-ca0ac0b2af13} twitter.js
-contract @instantbird.org/purple/twitter;1 {31082ff6-1de8-422b-ab60-ca0ac0b2af13}
-category im-protocol-plugin prpl-twitter @instantbird.org/purple/twitter;1
+contract @mozilla.org/chat/twitter;1 {31082ff6-1de8-422b-ab60-ca0ac0b2af13}
+category im-protocol-plugin prpl-twitter @mozilla.org/chat/twitter;1
--- a/chat/protocols/xmpp/xmpp.manifest
+++ b/chat/protocols/xmpp/xmpp.manifest
@@ -1,3 +1,3 @@
 component {dde786d1-6f59-43d0-9bc8-b505a757fb30} xmpp.js
-contract @instantbird.org/purple/xmpp;1 {dde786d1-6f59-43d0-9bc8-b505a757fb30}
-#category im-protocol-plugin prpl-jabber @instantbird.org/purple/xmpp;1
+contract @mozilla.org/chat/xmpp;1 {dde786d1-6f59-43d0-9bc8-b505a757fb30}
+#category im-protocol-plugin prpl-jabber @mozilla.org/chat/xmpp;1
--- a/im/modules/ibCore.jsm
+++ b/im/modules/ibCore.jsm
@@ -65,17 +65,17 @@ var Core = {
       // don't worry too much about this exception.
     }
 
     if (!Ci.purpleICoreService) {
       this._promptError("startupFailure.purplexpcomFileError");
       return false;
     }
 
-    if (!Components.classes["@instantbird.org/purple/core-service;1"]) {
+    if (!Components.classes["@mozilla.org/chat/core-service;1"]) {
       this._promptError("startupFailure.xpcomRegistrationError");
       return false;
     }
 
     try {
       Services.core.init();
     }
     catch (e) {