[Pkg-mozext-commits] [adblock-plus-element-hiding-helper] 226/483: Update from XPCOM registration changes in Firefox 4

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus-element-hiding-helper.

commit 82f1d824e411431f4320d20591232819a3a9fa68
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Wed Oct 20 17:14:14 2010 +0200

    Update from XPCOM registration changes in Firefox 4
---
 chrome.manifest           | 5 +++++
 components/Initializer.js | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/chrome.manifest b/chrome.manifest
index 57c527f..8c92fd2 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -4,5 +4,10 @@ skin      elemhidehelper classic/1.0 jar:chrome/elemhidehelper.jar!/skin/
 locale    elemhidehelper {{LOCALE}} jar:chrome/elemhidehelper.jar!/locale/{{LOCALE}}/
 content   elemhidehelper-modules modules/
 
+# Component registration
+component {2d53b96c-1dd2-11b2-94ad-dedbdb99852f} components/Initializer.js
+contract @adblockplus.org/ehh/startup;1 {2d53b96c-1dd2-11b2-94ad-dedbdb99852f}
+category profile-after-change @adblockplus.org/ehh/startup;1 @adblockplus.org/ehh/startup;1
+
 # Hack to allow the icon to be accessed via chrome URL
 skin      elemhidehelper-icon classic/1.0 ./
diff --git a/components/Initializer.js b/components/Initializer.js
index a69e15f..1e8a14f 100644
--- a/components/Initializer.js
+++ b/components/Initializer.js
@@ -49,6 +49,7 @@ Initializer.prototype =
     switch (topic)
     {
       case "app-startup":
+      case "profile-after-change":
         observerService.addObserver(this, "final-ui-startup", true);
         break;
       case "final-ui-startup":
@@ -64,4 +65,7 @@ Initializer.prototype =
   }
 };
 
-var NSGetModule = XPCOMUtils.generateNSGetModule([Initializer]);
+if (XPCOMUtils.generateNSGetFactory)
+  var NSGetFactory = XPCOMUtils.generateNSGetFactory([Initializer]);
+else
+  var NSGetModule = XPCOMUtils.generateNSGetModule([Initializer]);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus-element-hiding-helper.git