Registration changes for services/sync and services/crypto required from bug 568691, landing on a CLOSED TREE to fix mobile bustage.

This commit is contained in:
Benjamin Smedberg 2010-07-01 15:08:13 -04:00
parent a249678c04
commit d73012c1c2
7 changed files with 18 additions and 14 deletions

View File

@ -51,6 +51,7 @@ XPIDLSRCS = \
EXTRA_COMPONENTS = \
WeaveCrypto.js \
WeaveCrypto.manifest \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -51,8 +51,6 @@ function WeaveCrypto() {
}
WeaveCrypto.prototype = {
classDescription: "WeaveCrypto",
contractID: "@labs.mozilla.com/Weave/Crypto;2",
classID: Components.ID("{7fa20841-c90e-4432-a1a1-ba3b20cb6b37}"),
QueryInterface: XPCOMUtils.generateQI([Ci.IWeaveCrypto]),
@ -1125,7 +1123,4 @@ WeaveCrypto.prototype = {
}
};
let component = typeof Services == "undefined" || typeof ctypes == "undefined" ? [] : [WeaveCrypto];
function NSGetModule (compMgr, fileSpec) {
return XPCOMUtils.generateModule(component);
}
const NSGetFactory = XPCOMUtils.generateNSGetFactory([WeaveCrypto]);

View File

@ -0,0 +1,2 @@
component {7fa20841-c90e-4432-a1a1-ba3b20cb6b37} WeaveCrypto.js
contract @labs.mozilla.com/Weave/Crypto;2 {7fa20841-c90e-4432-a1a1-ba3b20cb6b37}

View File

@ -56,4 +56,4 @@ FormNotifier.prototype = {
};
let components = [FormNotifier];
function NSGetModule(compMgr, fileSpec) XPCOMUtils.generateModule(components);
const NSGetFactory = XPCOMUtils.generateNSGetFactory(components);

View File

@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = locales
EXTRA_COMPONENTS = \
SyncComponents.manifest \
FormNotifier.js \
Weave.js \
$(NULL)

View File

@ -0,0 +1,12 @@
# FormNotifier.js
component {be5a097b-6ee6-4c6a-8eca-6bce87d570e9} FormNotifier.js
contract @mozilla.org/satchel/form-history;1 {be5a097b-6ee6-4c6a-8eca-6bce87d570e9}
# Weave.js
component {74b89fb0-f200-4ae8-a3ec-dd164117f6de} Weave.js
contract @mozilla.org/weave/service;1 {74b89fb0-f200-4ae8-a3ec-dd164117f6de}
category app-startup WeaveService service,@mozilla.org/weave/service;1
component {d28f8a0b-95da-48f4-b712-caf37097be41} Weave.js
contract @mozilla.org/network/protocol/about;1?what=sync-log {d28f8a0b-95da-48f4-b712-caf37097be41}
component {a08ee179-df50-48e0-9c87-79e4dd5caeb1} Weave.js
contract @mozilla.org/network/protocol/about;1?what=sync-log.1 {a08ee179-df50-48e0-9c87-79e4dd5caeb1}

View File

@ -44,10 +44,7 @@ function WeaveService() {
this.wrappedJSObject = this;
}
WeaveService.prototype = {
classDescription: "Weave Service",
contractID: "@mozilla.org/weave/service;1",
classID: Components.ID("{74b89fb0-f200-4ae8-a3ec-dd164117f6de}"),
_xpcom_categories: [{ category: "app-startup", service: true }],
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
@ -95,8 +92,6 @@ WeaveService.prototype = {
function AboutWeaveLog() {}
AboutWeaveLog.prototype = {
classDescription: "about:sync-log",
contractID: "@mozilla.org/network/protocol/about;1?what=sync-log",
classID: Components.ID("{d28f8a0b-95da-48f4-b712-caf37097be41}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule,
@ -123,8 +118,6 @@ AboutWeaveLog.prototype = {
function AboutWeaveLog1() {}
AboutWeaveLog1.prototype = {
classDescription: "about:sync-log.1",
contractID: "@mozilla.org/network/protocol/about;1?what=sync-log.1",
classID: Components.ID("{a08ee179-df50-48e0-9c87-79e4dd5caeb1}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule,