[Pkg-mozext-commits] [requestpolicy] 191/280: Show RP in SeaMonkey's "Tools" menu

[David Prévot]

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

taffit pushed a commit to branch master
in repository requestpolicy.

commit bf748ad7ea5fb815ac4f6ae90e77ee94ed3add7b
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Jan 27 11:56:53 2015 +0100

    Show RP in SeaMonkey's "Tools" menu
    
    part of #502
---
 src/content/lib/utils/constants.jsm |  1 +
 src/content/lib/utils/xul.jsm       | 14 ++++++++++++--
 src/content/ui/xul-trees.js         |  6 +++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/content/lib/utils/constants.jsm b/src/content/lib/utils/constants.jsm
index 22b2aa2..ef81422 100644
--- a/src/content/lib/utils/constants.jsm
+++ b/src/content/lib/utils/constants.jsm
@@ -31,6 +31,7 @@ let C = {};
 
 C.EXTENSION_ID = "requestpolicy at requestpolicy.com";
 C.FIREFOX_ID = "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";
+C.SEAMONKEY_ID = "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}";
 C.MMID = C.EXTENSION_ID; // message manager ID
 C.MM_PREFIX = C.MMID + ":";
 
diff --git a/src/content/lib/utils/xul.jsm b/src/content/lib/utils/xul.jsm
index c239e79..67993cc 100644
--- a/src/content/lib/utils/xul.jsm
+++ b/src/content/lib/utils/xul.jsm
@@ -28,7 +28,11 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
-ScriptLoader.importModules(["lib/logger", "lib/utils/strings"], this);
+ScriptLoader.importModules([
+  "lib/logger",
+  "lib/utils/strings",
+  "lib/utils/constants"
+], this);
 
 let EXPORTED_SYMBOLS = ["XULUtils"];
 
@@ -36,9 +40,15 @@ let XULUtils = {};
 
 let xulTrees = XULUtils.xulTrees = {};
 
+let xulTreesScope = {
+  "exports": xulTrees,
+  "C": C,
+  "appID": Services.appinfo.ID
+};
+
 Services.scriptloader.loadSubScriptWithOptions(
     'chrome://requestpolicy/content/ui/xul-trees.js',
-    {target: {exports: xulTrees}/*, ignoreCache: true*/});
+    {target: xulTreesScope/*, ignoreCache: true*/});
 
 
 function getParentElement(doc, element) {
diff --git a/src/content/ui/xul-trees.js b/src/content/ui/xul-trees.js
index 86e6b2a..203d50a 100644
--- a/src/content/ui/xul-trees.js
+++ b/src/content/ui/xul-trees.js
@@ -21,6 +21,10 @@
  * ***** END LICENSE BLOCK *****
  */
 
+// differences in seamonkey:
+// https://developer.mozilla.org/en-US/Add-ons/SeaMonkey_2
+let isSeamonkey = appID === C.SEAMONKEY_ID;
+
 
 exports.toolbarbutton = [
   {parent: {special: {type: "subobject", id: "navigator-toolbox",
@@ -32,7 +36,7 @@ exports.toolbarbutton = [
 ];
 
 exports.mainTree = [
-  {parent: {id: "menu_ToolsPopup"},
+  {parent: {id: (isSeamonkey ? "taskPopup" : "menu_ToolsPopup")},
       tag: "menu", id: "requestpolicyToolsMenuPopup", label: "RequestPolicy",
       accesskey: "r",
   children: [

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