[Pkg-mozext-commits] [requestpolicy] 108/280: move some modules to main/

[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 401b6f4f5b9cd0d0f0b278144545bca751d05598
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Jan 6 01:10:04 2015 +0100

    move some modules to main/
---
 src/content/lib/process-environment.jsm                   | 7 +++++--
 src/content/lib/request-processor.jsm                     | 2 +-
 src/content/lib/request-processor.redirects.js            | 2 +-
 src/content/{lib => main}/about-uri.jsm                   | 0
 src/content/{lib => main}/requestpolicy-service.jsm       | 0
 src/content/{lib => main}/window-manager-toolbarbutton.js | 0
 src/content/{lib => main}/window-manager.jsm              | 4 ++--
 src/content/{lib => main}/window-manager.listener.js      | 0
 src/content/settings/common.js                            | 2 +-
 src/content/ui/menu.js                                    | 2 +-
 src/content/ui/overlay.js                                 | 2 +-
 11 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/content/lib/process-environment.jsm b/src/content/lib/process-environment.jsm
index 6f09b7e..5c9eb60 100644
--- a/src/content/lib/process-environment.jsm
+++ b/src/content/lib/process-environment.jsm
@@ -121,8 +121,11 @@ if (ProcessEnvironment.isMainProcess) {
       // import the Logger as the first module so that its startup-function
       // will be called after this one
       ScriptLoader.importModule("lib/logger", globalScope);
-      ScriptLoader.importModules(["lib/requestpolicy-service", "lib/window-manager",
-                                  "lib/about-uri"], globalScope);
+      ScriptLoader.importModules([
+        "main/requestpolicy-service",
+        "main/window-manager",
+        "main/about-uri"
+      ], globalScope);
     }
   });
   // =======================================
diff --git a/src/content/lib/request-processor.jsm b/src/content/lib/request-processor.jsm
index 0fe0601..f6444d4 100644
--- a/src/content/lib/request-processor.jsm
+++ b/src/content/lib/request-processor.jsm
@@ -51,7 +51,7 @@ ScriptLoader.importModules([
 ], this);
 ScriptLoader.defineLazyModuleGetters({
   "lib/content-policy": ["PolicyImplementation"],
-  "lib/requestpolicy-service": ["rpService"]
+  "main/requestpolicy-service": ["rpService"]
 }, this);
 
 
diff --git a/src/content/lib/request-processor.redirects.js b/src/content/lib/request-processor.redirects.js
index 4c60a4a..d6636fd 100644
--- a/src/content/lib/request-processor.redirects.js
+++ b/src/content/lib/request-processor.redirects.js
@@ -39,7 +39,7 @@ ScriptLoader.importModules([
   "lib/process-environment"
 ], this);
 ScriptLoader.defineLazyModuleGetters({
-  "lib/requestpolicy-service": ["rpService"]
+  "main/requestpolicy-service": ["rpService"]
 }, this);
 
 
diff --git a/src/content/lib/about-uri.jsm b/src/content/main/about-uri.jsm
similarity index 100%
rename from src/content/lib/about-uri.jsm
rename to src/content/main/about-uri.jsm
diff --git a/src/content/lib/requestpolicy-service.jsm b/src/content/main/requestpolicy-service.jsm
similarity index 100%
rename from src/content/lib/requestpolicy-service.jsm
rename to src/content/main/requestpolicy-service.jsm
diff --git a/src/content/lib/window-manager-toolbarbutton.js b/src/content/main/window-manager-toolbarbutton.js
similarity index 100%
rename from src/content/lib/window-manager-toolbarbutton.js
rename to src/content/main/window-manager-toolbarbutton.js
diff --git a/src/content/lib/window-manager.jsm b/src/content/main/window-manager.jsm
similarity index 98%
rename from src/content/lib/window-manager.jsm
rename to src/content/main/window-manager.jsm
index 0fc5e02..1de6c1d 100644
--- a/src/content/lib/window-manager.jsm
+++ b/src/content/main/window-manager.jsm
@@ -44,7 +44,7 @@ let rpWindowManager = (function(self) {
   ], globalScope);
 
   // import the WindowListener
-  Services.scriptloader.loadSubScript("chrome://requestpolicy/content/lib/" +
+  Services.scriptloader.loadSubScript("chrome://requestpolicy/content/main/" +
                                       "window-manager.listener.js",
                                       globalScope);
 
@@ -216,5 +216,5 @@ let rpWindowManager = (function(self) {
 
 // extend rpWindowManager
 Services.scriptloader.loadSubScript(
-    "chrome://requestpolicy/content/lib/window-manager-toolbarbutton.js",
+    "chrome://requestpolicy/content/main/window-manager-toolbarbutton.js",
     globalScope);
diff --git a/src/content/lib/window-manager.listener.js b/src/content/main/window-manager.listener.js
similarity index 100%
rename from src/content/lib/window-manager.listener.js
rename to src/content/main/window-manager.listener.js
diff --git a/src/content/settings/common.js b/src/content/settings/common.js
index c499cfb..e760ab4 100644
--- a/src/content/settings/common.js
+++ b/src/content/settings/common.js
@@ -14,7 +14,7 @@ ScriptLoader.importModules([
   "lib/logger",
   "lib/subscription",
   "lib/policy-manager",
-  "lib/requestpolicy-service",
+  "main/requestpolicy-service",
   "lib/environment"
 ], this);
 
diff --git a/src/content/ui/menu.js b/src/content/ui/menu.js
index 2cb8ab1..c9bdabb 100644
--- a/src/content/ui/menu.js
+++ b/src/content/ui/menu.js
@@ -47,7 +47,7 @@ requestpolicy.menu = (function() {
        GUILocation, GUILocationProperties} = iMod("lib/gui-location");
   let {StringUtils} = iMod("lib/utils/strings");
   let {DOMUtils} = iMod("lib/utils/dom");
-  let {rpService} = iMod("lib/requestpolicy-service");
+  let {rpService} = iMod("main/requestpolicy-service");
   let {RULE_ACTION_ALLOW, RULE_ACTION_DENY} = iMod("lib/constants");
 
 
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index cd4200c..3736731 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -49,7 +49,7 @@ requestpolicy.overlay = (function() {
   let {DomainUtil} = iMod("lib/utils/domains");
   let {StringUtils} = iMod("lib/utils/strings");
   let {DOMUtils} = iMod("lib/utils/dom");
-  let {rpService} = iMod("lib/requestpolicy-service");
+  let {rpService} = iMod("main/requestpolicy-service");
   let {MMID} = iMod("lib/constants");
 
   let $ = function(id) {

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