Bug 737396 - Remove the unnecessary and incorrect 'service,' at the start of cloud file category definitions. r=mconley,a=Standard8
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 20 Mar 2012 13:53:59 +0000
changeset 11117 2aa87c700865f9b7e27ccd338af036860daf8e27
parent 11116 cfe6fdbff36df68b92ba37b0a5e39859d339ba8d
child 11118 7368ce5fc0568287525d697462dba068b427d7ee
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley, Standard8
bugs737396
Bug 737396 - Remove the unnecessary and incorrect 'service,' at the start of cloud file category definitions. r=mconley,a=Standard8
mail/components/cloudfile/cloudFileAccounts.js
mail/components/cloudfile/cloudFileComponents.manifest
mail/test/mozmill/shared-modules/test-cloudfile-helpers.js
--- a/mail/components/cloudfile/cloudFileAccounts.js
+++ b/mail/components/cloudfile/cloudFileAccounts.js
@@ -110,18 +110,17 @@ var cloudFileAccounts = {
     else
       throw new Error("string or nsIMsgCloudFileProvider expected");
   },
 
   getProviderForType: function(aType) {
     let className;
 
     try {
-      className = categoryManager.getCategoryEntry(CATEGORY, aType)
-                                 .substring(8); // remove "service,"
+      className = categoryManager.getCategoryEntry(CATEGORY, aType);
     } catch(e) {
       Cu.reportError(e);
       return null;
     }
 
     let provider = Cc[className].createInstance(Ci.nsIMsgCloudFileProvider);
     return provider;
   },
--- a/mail/components/cloudfile/cloudFileComponents.manifest
+++ b/mail/components/cloudfile/cloudFileComponents.manifest
@@ -1,7 +1,7 @@
 component {32fd439f-9eb6-4907-ac0b-2c88eb14d98d} nsYouSendIt.js
 contract @mozilla.org/mail/yousendit;1 {32fd439f-9eb6-4907-ac0b-2c88eb14d98d}
-category cloud-files YouSendIt service,@mozilla.org/mail/yousendit;1
+category cloud-files YouSendIt @mozilla.org/mail/yousendit;1
 
 component {2fd8a64a-a496-4cf4-9d6b-d3f9800c6322} nsDropbox.js
 contract @mozilla.org/mail/dropbox;1 {2fd8a64a-a496-4cf4-9d6b-d3f9800c6322}
-category cloud-files Dropbox service,@mozilla.org/mail/dropbox;1
+category cloud-files Dropbox @mozilla.org/mail/dropbox;1
--- a/mail/test/mozmill/shared-modules/test-cloudfile-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-cloudfile-helpers.js
@@ -98,18 +98,17 @@ MockCloudfileController.prototype = {
     this.account = aAccount;
   },
 };
 
 var gMockCloudfileManager = {
   _mock_map: {},
 
   register: function MCM_register() {
-    gCategoryManager.addCategoryEntry("cloud-files", kMockID,
-                                      "service," + kMockContractID,
+    gCategoryManager.addCategoryEntry("cloud-files", kMockID, kMockContractID,
                                       false, true);
     gMockCloudfileComponent.register();
   },
 
   unregister: function MCM_unregister() {
     gCategoryManager.deleteCategoryEntry("cloud-files", kMockID, false);
     gMockCloudfileComponent.unregister();
   },