[Pkg-mozext-commits] [greasemonkey] 34/43: Restore usage of "global" message manager.

[David Prévot]

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

taffit pushed a commit to branch master
in repository greasemonkey.

commit 9797d26aca182687a1605bbdd94215458b8c6db1
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Mon Feb 2 12:58:33 2015 -0500

    Restore usage of "global" message manager.
    
    For most everything.  Just scripts-for-uuid via "parent" message manager.
    
    Fixes #2082
---
 components/greasemonkey.js | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/components/greasemonkey.js b/components/greasemonkey.js
index 8cb2171..9f16e2d 100644
--- a/components/greasemonkey.js
+++ b/components/greasemonkey.js
@@ -44,35 +44,38 @@ function startup(aService) {
   loader.loadSubScript("chrome://greasemonkey/content/config.js");
   loader.loadSubScript("chrome://greasemonkey/content/third-party/mpl-utils.js");
 
-  var parentMessageManager = Cc["@mozilla.org/parentprocessmessagemanager;1"]
+  // Most incoming messages go to the "global" message manager.
+  var globalMessageManager = Cc["@mozilla.org/globalmessagemanager;1"]
       .getService(Ci.nsIMessageListenerManager);
-
-  parentMessageManager.addMessageListener(
+  globalMessageManager.addMessageListener(
       'greasemonkey:script-install', aService.scriptInstall.bind(aService));
-  parentMessageManager.addMessageListener(
+  globalMessageManager.addMessageListener(
       'greasemonkey:scripts-for-url', aService.getScriptsForUrl.bind(aService));
-  parentMessageManager.addMessageListener(
-      'greasemonkey:scripts-for-uuid',
-      aService.getScriptsForUuid.bind(aService));
-  parentMessageManager.addMessageListener(
-    'greasemonkey:url-is-temp-file', aService.urlIsTempFile.bind(aService));
+  globalMessageManager.addMessageListener(
+      'greasemonkey:url-is-temp-file', aService.urlIsTempFile.bind(aService));
 
   var scriptValHandler = aService.handleScriptValMsg.bind(aService);
+  globalMessageManager.addMessageListener(
+      'greasemonkey:scriptVal-delete', scriptValHandler);
+  globalMessageManager.addMessageListener(
+      'greasemonkey:scriptVal-get', scriptValHandler);
+  globalMessageManager.addMessageListener(
+      'greasemonkey:scriptVal-list', scriptValHandler);
+  globalMessageManager.addMessageListener(
+      'greasemonkey:scriptVal-set', scriptValHandler);
+
+  // This particular message must be listened for by the "parent" and not
+  // by "global".  Why?!?!?
+  var parentMessageManager = Cc["@mozilla.org/parentprocessmessagemanager;1"]
+      .getService(Ci.nsIMessageListenerManager);
   parentMessageManager.addMessageListener(
-    'greasemonkey:scriptVal-delete', scriptValHandler);
-  parentMessageManager.addMessageListener(
-    'greasemonkey:scriptVal-get', scriptValHandler);
-  parentMessageManager.addMessageListener(
-    'greasemonkey:scriptVal-list', scriptValHandler);
-  parentMessageManager.addMessageListener(
-    'greasemonkey:scriptVal-set', scriptValHandler);
+      'greasemonkey:scripts-for-uuid',
+      aService.getScriptsForUuid.bind(aService));
 
   // Yes, we have to load the frame script once here in the parent scope.
   // Why?  Who knows!?
-  var globalMessageManager = Cc["@mozilla.org/globalmessagemanager;1"]
-      .getService(Ci.nsIMessageListenerManager);
   globalMessageManager.loadFrameScript(
-      "chrome://greasemonkey/content/framescript.js", true);
+      'chrome://greasemonkey/content/framescript.js', true);
 
   Services.obs.addObserver(aService, 'quit-application', false);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/greasemonkey.git