[Pkg-mozext-commits] [requestpolicy] 10/80: update the "packagename" of the chrome registration
David Prévot
taffit at moszumanska.debian.org
Sun Jul 5 15:02:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit 45284b5065d2e391d091d81257b54e38fd165051
Author: Martin Kimmerle <dev at 256k.de>
Date: Tue May 12 00:57:11 2015 +0200
update the "packagename" of the chrome registration
Old: `chrome://requestpolicy/`
New: `chrome://rpcontinued/`
---
src/bootstrap.js | 2 +-
src/chrome.manifest | 42 +++++++++++-----------
src/content/lib/default-preferences.js | 2 +-
src/content/lib/environment.jsm | 4 +--
src/content/lib/environment.process.js | 6 ++--
.../lib/framescript-to-overlay-communication.jsm | 2 +-
src/content/lib/gui-location.jsm | 2 +-
src/content/lib/http-response.jsm | 2 +-
src/content/lib/logger.jsm | 2 +-
src/content/lib/manager-for-event-listeners.jsm | 2 +-
src/content/lib/manager-for-message-listeners.jsm | 2 +-
src/content/lib/observer-manager.jsm | 2 +-
src/content/lib/policy-manager.jsm | 4 +--
src/content/lib/prefs.jsm | 2 +-
src/content/lib/request-processor.compat.js | 2 +-
src/content/lib/request-processor.jsm | 6 ++--
src/content/lib/request-processor.redirects.js | 2 +-
src/content/lib/request-set.jsm | 2 +-
src/content/lib/request.jsm | 2 +-
src/content/lib/ruleset-storage.jsm | 2 +-
src/content/lib/ruleset.jsm | 2 +-
src/content/lib/script-loader.jsm | 2 +-
src/content/lib/subscription.jsm | 2 +-
src/content/lib/utils.jsm | 2 +-
src/content/lib/utils/domains.jsm | 2 +-
src/content/lib/utils/strings.jsm | 2 +-
src/content/lib/utils/windows.jsm | 2 +-
src/content/lib/utils/xul.jsm | 4 +--
src/content/main/about-uri.jsm | 4 +--
src/content/main/content-policy.jsm | 2 +-
src/content/main/default-pref-handler.js | 2 +-
src/content/main/pref-manager.jsm | 4 +--
src/content/main/requestpolicy-service.jsm | 2 +-
src/content/main/window-manager-toolbarbutton.js | 2 +-
src/content/main/window-manager.jsm | 20 +++++------
src/content/settings/advancedprefs.html | 8 ++---
src/content/settings/basicprefs.html | 8 ++---
src/content/settings/common.js | 2 +-
src/content/settings/defaultpolicy.html | 8 ++---
src/content/settings/oldrules.html | 8 ++---
src/content/settings/setup.html | 8 ++---
src/content/settings/subscriptions.html | 8 ++---
src/content/settings/yourpolicy.html | 8 ++---
src/content/ui/classicmenu.js | 2 +-
src/content/ui/frame.js | 6 ++--
src/content/ui/menu.js | 2 +-
src/content/ui/overlay.js | 4 +--
src/content/ui/request-log.filtering.js | 2 +-
src/content/ui/request-log.interface.js | 2 +-
src/content/ui/request-log.js | 2 +-
src/content/ui/request-log.tree-view.js | 4 +--
src/content/ui/request-log.xul | 4 +--
src/content/ui/xul-trees.js | 2 +-
src/install.rdf | 2 +-
src/skin/initial-setup.css | 2 +-
src/skin/requestpolicy.css | 16 ++++-----
src/skin/toolbarbutton-seamonkey.css | 16 ++++-----
src/skin/toolbarbutton.css | 30 ++++++++--------
.../mozmill/extension/content/console-observer.jsm | 2 +-
.../detectErrors/testDetectingErrors.js | 2 +-
tests/mozmill/lib/request-log-utils.js | 2 +-
tests/xpcshell/head_loadrp.js | 4 +--
tests/xpcshell/head_utils.js | 4 +--
tests/xpcshell/test_fileutil.js | 2 +-
tests/xpcshell/test_policymanager.js | 6 ++--
tests/xpcshell/test_policystorage.js | 4 +--
tests/xpcshell/test_subscription.js | 2 +-
67 files changed, 164 insertions(+), 164 deletions(-)
diff --git a/src/bootstrap.js b/src/bootstrap.js
index c22a6f9..a31b057 100644
--- a/src/bootstrap.js
+++ b/src/bootstrap.js
@@ -26,7 +26,7 @@ const Cc = Components.classes;
const Cu = Components.utils;
var mod = {};
-const envURI = "chrome://requestpolicy/content/lib/environment.jsm";
+const envURI = "chrome://rpcontinued/content/lib/environment.jsm";
/**
* If any Exception gets into bootstrap.js, it will be a severe error.
diff --git a/src/chrome.manifest b/src/chrome.manifest
index 2376b5f..1f5c7db 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -1,22 +1,22 @@
-content requestpolicy content/
-skin requestpolicy classic/1.0 skin/
+content rpcontinued content/
+skin rpcontinued classic/1.0 skin/
-locale requestpolicy en-US locale/en-US/
-locale requestpolicy de locale/de/
-locale requestpolicy eo locale/eo/
-locale requestpolicy es-MX locale/es-MX/
-locale requestpolicy eu locale/eu/
-locale requestpolicy fr locale/fr/
-locale requestpolicy it locale/it/
-locale requestpolicy ja locale/ja/
-locale requestpolicy ko-KR locale/ko-KR/
-locale requestpolicy lv-LV locale/lv-LV/
-locale requestpolicy nl locale/nl/
-locale requestpolicy pt-BR locale/pt-BR/
-locale requestpolicy ru-RU locale/ru-RU/
-locale requestpolicy sk-SK locale/sk-SK/
-locale requestpolicy sv-SE locale/sv-SE/
-locale requestpolicy tr locale/tr/
-locale requestpolicy uk-UA locale/uk-UA/
-locale requestpolicy zh-CN locale/zh-CN/
-locale requestpolicy zh-TW locale/zh-TW/
+locale rpcontinued en-US locale/en-US/
+locale rpcontinued de locale/de/
+locale rpcontinued eo locale/eo/
+locale rpcontinued es-MX locale/es-MX/
+locale rpcontinued eu locale/eu/
+locale rpcontinued fr locale/fr/
+locale rpcontinued it locale/it/
+locale rpcontinued ja locale/ja/
+locale rpcontinued ko-KR locale/ko-KR/
+locale rpcontinued lv-LV locale/lv-LV/
+locale rpcontinued nl locale/nl/
+locale rpcontinued pt-BR locale/pt-BR/
+locale rpcontinued ru-RU locale/ru-RU/
+locale rpcontinued sk-SK locale/sk-SK/
+locale rpcontinued sv-SE locale/sv-SE/
+locale rpcontinued tr locale/tr/
+locale rpcontinued uk-UA locale/uk-UA/
+locale rpcontinued zh-CN locale/zh-CN/
+locale rpcontinued zh-TW locale/zh-TW/
diff --git a/src/content/lib/default-preferences.js b/src/content/lib/default-preferences.js
index 80fc66d..7892025 100644
--- a/src/content/lib/default-preferences.js
+++ b/src/content/lib/default-preferences.js
@@ -1,5 +1,5 @@
pref("extensions.rpcontinued at requestpolicy.org.description",
- "chrome://requestpolicy/locale/requestpolicy.properties");
+ "chrome://rpcontinued/locale/requestpolicy.properties");
pref("extensions.requestpolicy.log", false);
pref("extensions.requestpolicy.log.level", 0);
diff --git a/src/content/lib/environment.jsm b/src/content/lib/environment.jsm
index 963e8f2..c1357b2 100644
--- a/src/content/lib/environment.jsm
+++ b/src/content/lib/environment.jsm
@@ -37,7 +37,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/devtools/Console.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.defineLazyModuleGetters({
"lib/manager-for-event-listeners": ["ManagerForEventListeners"],
@@ -534,5 +534,5 @@ FrameScriptEnvironment.prototype.constructor = Environment;
// Load the "ProcessEnvironment"
-Services.scriptloader.loadSubScript("chrome://requestpolicy/content/" +
+Services.scriptloader.loadSubScript("chrome://rpcontinued/content/" +
"lib/environment.process.js");
diff --git a/src/content/lib/environment.process.js b/src/content/lib/environment.process.js
index 7333366..7ab3b0a 100644
--- a/src/content/lib/environment.process.js
+++ b/src/content/lib/environment.process.js
@@ -139,7 +139,7 @@ let ProcessEnvironment = (function() {
ProcessEnvironmentBase.prototype.shutdown.apply(self, arguments);
ScriptLoader.doShutdownTasks();
- Cu.unload("chrome://requestpolicy/content/lib/script-loader.jsm");
+ Cu.unload("chrome://rpcontinued/content/lib/script-loader.jsm");
};
@@ -171,7 +171,7 @@ let ProcessEnvironment = (function() {
// After that task, any global object, such as
// `Environment` or `Cu` is not available anymore.
//console.debug("unloading environment.jsm");
- Cu.unload("chrome://requestpolicy/content/lib/environment.jsm");
+ Cu.unload("chrome://rpcontinued/content/lib/environment.jsm");
};
childMM.addMessageListener(shutdownMessage, receiveShutdownMessage);
@@ -189,7 +189,7 @@ let ProcessEnvironment = (function() {
ProcessEnvironmentBase.prototype.shutdown.apply(self, arguments);
ScriptLoader.doShutdownTasks();
- Cu.unload("chrome://requestpolicy/content/lib/script-loader.jsm");
+ Cu.unload("chrome://rpcontinued/content/lib/script-loader.jsm");
};
ChildProcessEnvironment.prototype.registerInnerEnvironment = function(aEnv) {
diff --git a/src/content/lib/framescript-to-overlay-communication.jsm b/src/content/lib/framescript-to-overlay-communication.jsm
index f1ba449..49ccf78 100644
--- a/src/content/lib/framescript-to-overlay-communication.jsm
+++ b/src/content/lib/framescript-to-overlay-communication.jsm
@@ -29,7 +29,7 @@ let EXPORTED_SYMBOLS = ["FramescriptToOverlayCommunication"];
let globalScope = this;
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/environment",
"lib/logger",
diff --git a/src/content/lib/gui-location.jsm b/src/content/lib/gui-location.jsm
index ade6912..beac326 100644
--- a/src/content/lib/gui-location.jsm
+++ b/src/content/lib/gui-location.jsm
@@ -32,7 +32,7 @@ let EXPORTED_SYMBOLS = [
"GUILocationProperties"
];
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules(["lib/utils/constants"], this);
diff --git a/src/content/lib/http-response.jsm b/src/content/lib/http-response.jsm
index a9ac4dc..b5f751e 100644
--- a/src/content/lib/http-response.jsm
+++ b/src/content/lib/http-response.jsm
@@ -32,7 +32,7 @@ let EXPORTED_SYMBOLS = [
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/logger",
"lib/utils/domains",
diff --git a/src/content/lib/logger.jsm b/src/content/lib/logger.jsm
index 3ccd6e2..fb2bd18 100644
--- a/src/content/lib/logger.jsm
+++ b/src/content/lib/logger.jsm
@@ -30,7 +30,7 @@ let EXPORTED_SYMBOLS = ["Logger"];
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/devtools/Console.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/environment",
"lib/prefs"
diff --git a/src/content/lib/manager-for-event-listeners.jsm b/src/content/lib/manager-for-event-listeners.jsm
index 55dbfed..ef77d51 100644
--- a/src/content/lib/manager-for-event-listeners.jsm
+++ b/src/content/lib/manager-for-event-listeners.jsm
@@ -29,7 +29,7 @@ let EXPORTED_SYMBOLS = ["ManagerForEventListeners"];
let globalScope = this;
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/environment",
"lib/logger"
diff --git a/src/content/lib/manager-for-message-listeners.jsm b/src/content/lib/manager-for-message-listeners.jsm
index 35a2830..b5c05d2 100644
--- a/src/content/lib/manager-for-message-listeners.jsm
+++ b/src/content/lib/manager-for-message-listeners.jsm
@@ -29,7 +29,7 @@ let EXPORTED_SYMBOLS = ["ManagerForMessageListeners"];
let globalScope = this;
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/environment",
"lib/logger",
diff --git a/src/content/lib/observer-manager.jsm b/src/content/lib/observer-manager.jsm
index 43e05f2..a71aae2 100644
--- a/src/content/lib/observer-manager.jsm
+++ b/src/content/lib/observer-manager.jsm
@@ -33,7 +33,7 @@ let EXPORTED_SYMBOLS = ["ObserverManager"];
let globalScope = this;
/* global ScriptLoader */
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/utils/observers", /* global SingleTopicObserver,
SinglePrefBranchObserver */
diff --git a/src/content/lib/policy-manager.jsm b/src/content/lib/policy-manager.jsm
index 0035a41..9322adc 100644
--- a/src/content/lib/policy-manager.jsm
+++ b/src/content/lib/policy-manager.jsm
@@ -31,7 +31,7 @@ const RULES_CHANGED_TOPIC = "requestpolicy-rules-changed";
Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/logger",
"lib/request-result",
@@ -349,4 +349,4 @@ let PolicyManager = (function(self) {
Services.scriptloader.loadSubScript(
- "chrome://requestpolicy/content/lib/policy-manager.alias-functions.js");
+ "chrome://rpcontinued/content/lib/policy-manager.alias-functions.js");
diff --git a/src/content/lib/prefs.jsm b/src/content/lib/prefs.jsm
index fe103a0..0b2f5b7 100644
--- a/src/content/lib/prefs.jsm
+++ b/src/content/lib/prefs.jsm
@@ -29,7 +29,7 @@ let EXPORTED_SYMBOLS = ['rpPrefBranch', 'rootPrefBranch', 'Prefs'];
Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules(["lib/environment"], this);
diff --git a/src/content/lib/request-processor.compat.js b/src/content/lib/request-processor.compat.js
index 4d63b30..2ff87ca 100644
--- a/src/content/lib/request-processor.compat.js
+++ b/src/content/lib/request-processor.compat.js
@@ -23,7 +23,7 @@
Cu.import("resource://gre/modules/AddonManager.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/logger",
"lib/utils",
diff --git a/src/content/lib/request-processor.jsm b/src/content/lib/request-processor.jsm
index 71b54ad..f8d6801 100644
--- a/src/content/lib/request-processor.jsm
+++ b/src/content/lib/request-processor.jsm
@@ -38,7 +38,7 @@ const CP_MAPPEDDESTINATION = 0x178c40bf;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/logger",
"lib/prefs",
@@ -1070,6 +1070,6 @@ let RequestProcessor = (function(self) {
Services.scriptloader.loadSubScript(
- 'chrome://requestpolicy/content/lib/request-processor.redirects.js');
+ 'chrome://rpcontinued/content/lib/request-processor.redirects.js');
Services.scriptloader.loadSubScript(
- 'chrome://requestpolicy/content/lib/request-processor.compat.js');
+ 'chrome://rpcontinued/content/lib/request-processor.compat.js');
diff --git a/src/content/lib/request-processor.redirects.js b/src/content/lib/request-processor.redirects.js
index bc38606..fd3ef78 100644
--- a/src/content/lib/request-processor.redirects.js
+++ b/src/content/lib/request-processor.redirects.js
@@ -26,7 +26,7 @@ const HTTPS_EVERYWHERE_REWRITE_TOPIC = "https-everywhere-uri-rewrite";
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/logger",
"lib/prefs",
diff --git a/src/content/lib/request-set.jsm b/src/content/lib/request-set.jsm
index a9870a8..62dfaba 100644
--- a/src/content/lib/request-set.jsm
+++ b/src/content/lib/request-set.jsm
@@ -27,7 +27,7 @@ const Cu = Components.utils;
let EXPORTED_SYMBOLS = ["RequestSet"];
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/logger",
"lib/utils/domains",
diff --git a/src/content/lib/request.jsm b/src/content/lib/request.jsm
index 313aff1..c6399bd 100644
--- a/src/content/lib/request.jsm
+++ b/src/content/lib/request.jsm
@@ -35,7 +35,7 @@ let EXPORTED_SYMBOLS = [
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/logger",
"lib/utils/domains",
diff --git a/src/content/lib/ruleset-storage.jsm b/src/content/lib/ruleset-storage.jsm
index 33e406a..0de8051 100644
--- a/src/content/lib/ruleset-storage.jsm
+++ b/src/content/lib/ruleset-storage.jsm
@@ -27,7 +27,7 @@ const Cu = Components.utils;
let EXPORTED_SYMBOLS = ["RulesetStorage"];
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/ruleset",
"lib/utils/files"
diff --git a/src/content/lib/ruleset.jsm b/src/content/lib/ruleset.jsm
index 41e6401..5247b70 100644
--- a/src/content/lib/ruleset.jsm
+++ b/src/content/lib/ruleset.jsm
@@ -30,7 +30,7 @@ let EXPORTED_SYMBOLS = [
"RawRuleset"
];
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/logger",
"lib/utils/domains",
diff --git a/src/content/lib/script-loader.jsm b/src/content/lib/script-loader.jsm
index 6476ba2..b9f6a8a 100644
--- a/src/content/lib/script-loader.jsm
+++ b/src/content/lib/script-loader.jsm
@@ -37,7 +37,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/devtools/Console.jsm");
-const rpChromeContentURI = 'chrome://requestpolicy/content/';
+const rpChromeContentURI = 'chrome://rpcontinued/content/';
function getModuleURI(id) {
return rpChromeContentURI + id + ".jsm";
diff --git a/src/content/lib/subscription.jsm b/src/content/lib/subscription.jsm
index a53103e..44d11b2 100644
--- a/src/content/lib/subscription.jsm
+++ b/src/content/lib/subscription.jsm
@@ -36,7 +36,7 @@ let EXPORTED_SYMBOLS = [
Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/logger",
"lib/ruleset",
diff --git a/src/content/lib/utils.jsm b/src/content/lib/utils.jsm
index 10ff720..702cd61 100644
--- a/src/content/lib/utils.jsm
+++ b/src/content/lib/utils.jsm
@@ -31,7 +31,7 @@ Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
//Cu.import("resource://gre/modules/devtools/Console.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/prefs",
"lib/utils/constants",
diff --git a/src/content/lib/utils/domains.jsm b/src/content/lib/utils/domains.jsm
index 585bbfb..9d66274 100644
--- a/src/content/lib/utils/domains.jsm
+++ b/src/content/lib/utils/domains.jsm
@@ -29,7 +29,7 @@ let EXPORTED_SYMBOLS = ["DomainUtil"];
Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules(["lib/logger"], this);
/*
diff --git a/src/content/lib/utils/strings.jsm b/src/content/lib/utils/strings.jsm
index 0a657b9..8e8b50c 100644
--- a/src/content/lib/utils/strings.jsm
+++ b/src/content/lib/utils/strings.jsm
@@ -41,7 +41,7 @@ let StringUtils = (function() {
XPCOMUtils.defineLazyGetter(self, "strbundle", function() {
return loadPropertiesFile(
- "chrome://requestpolicy/locale/requestpolicy.properties");
+ "chrome://rpcontinued/locale/requestpolicy.properties");
});
// from https://developer.mozilla.org/en-US/Add-ons/
// How_to_convert_an_overlay_extension_to_restartless
diff --git a/src/content/lib/utils/windows.jsm b/src/content/lib/utils/windows.jsm
index 9364d1e..0fc98c5 100644
--- a/src/content/lib/utils/windows.jsm
+++ b/src/content/lib/utils/windows.jsm
@@ -27,7 +27,7 @@ const Cu = Components.utils;
let EXPORTED_SYMBOLS = ["WindowUtils"];
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules(["lib/prefs"], this);
diff --git a/src/content/lib/utils/xul.jsm b/src/content/lib/utils/xul.jsm
index 877e98a..551a2cf 100644
--- a/src/content/lib/utils/xul.jsm
+++ b/src/content/lib/utils/xul.jsm
@@ -27,7 +27,7 @@ const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/logger",
"lib/utils/strings",
@@ -47,7 +47,7 @@ let xulTreesScope = {
};
Services.scriptloader.loadSubScript(
- 'chrome://requestpolicy/content/ui/xul-trees.js',
+ 'chrome://rpcontinued/content/ui/xul-trees.js',
xulTreesScope);
diff --git a/src/content/main/about-uri.jsm b/src/content/main/about-uri.jsm
index 3e0eb27..25d74a9 100644
--- a/src/content/main/about-uri.jsm
+++ b/src/content/main/about-uri.jsm
@@ -34,7 +34,7 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
let globalScope = this;
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/environment",
"lib/utils"
@@ -59,7 +59,7 @@ function getURI(aURI) {
if (!id || !(id in filenames)) {
id = "basicprefs";
}
- return "chrome://requestpolicy/content/settings/" + filenames[id];
+ return "chrome://rpcontinued/content/settings/" + filenames[id];
}
diff --git a/src/content/main/content-policy.jsm b/src/content/main/content-policy.jsm
index 9b91249..8a438d0 100644
--- a/src/content/main/content-policy.jsm
+++ b/src/content/main/content-policy.jsm
@@ -33,7 +33,7 @@ let globalScope = this;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/utils/constants",
"lib/logger",
diff --git a/src/content/main/default-pref-handler.js b/src/content/main/default-pref-handler.js
index 77a62c7..2b38af3 100644
--- a/src/content/main/default-pref-handler.js
+++ b/src/content/main/default-pref-handler.js
@@ -109,6 +109,6 @@ try {
// How_to_convert_an_overlay_extension_to_restartless
// #Step_4.3A_Manually_handle_default_preferences )
Services.scriptloader.loadSubScript(
- "chrome://requestpolicy/content/lib/default-preferences.js",
+ "chrome://rpcontinued/content/lib/default-preferences.js",
defaultPrefScriptScope);
} catch (e) {}
diff --git a/src/content/main/pref-manager.jsm b/src/content/main/pref-manager.jsm
index 74cb485..f382f98 100644
--- a/src/content/main/pref-manager.jsm
+++ b/src/content/main/pref-manager.jsm
@@ -33,7 +33,7 @@ Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/devtools/Console.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/utils/constants",
"lib/environment"
@@ -85,7 +85,7 @@ let PrefManager = (function() {
// https://bugzilla.mozilla.org/show_bug.cgi?id=564675
// The scope of that script doesn't need to be remembered.
Services.scriptloader.loadSubScript(
- "chrome://requestpolicy/content/main/default-pref-handler.js",
+ "chrome://rpcontinued/content/main/default-pref-handler.js",
{});
diff --git a/src/content/main/requestpolicy-service.jsm b/src/content/main/requestpolicy-service.jsm
index 25e683e..22e5942 100644
--- a/src/content/main/requestpolicy-service.jsm
+++ b/src/content/main/requestpolicy-service.jsm
@@ -30,7 +30,7 @@ let EXPORTED_SYMBOLS = ["rpService"];
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/logger",
"lib/prefs",
diff --git a/src/content/main/window-manager-toolbarbutton.js b/src/content/main/window-manager-toolbarbutton.js
index e8c4210..e73e5a8 100644
--- a/src/content/main/window-manager-toolbarbutton.js
+++ b/src/content/main/window-manager-toolbarbutton.js
@@ -28,7 +28,7 @@ const Cu = Components.utils;
const toolbarButtonId = "requestpolicyToolbarButton";
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules(["lib/utils/xul", "lib/utils", "lib/logger"], this);
if (Utils.info.isAustralis) {
diff --git a/src/content/main/window-manager.jsm b/src/content/main/window-manager.jsm
index ba15538..a70d2ab 100644
--- a/src/content/main/window-manager.jsm
+++ b/src/content/main/window-manager.jsm
@@ -35,7 +35,7 @@ let rpWindowManager = (function(self) {
Cu.import("resource://gre/modules/Services.jsm", globalScope);
Cu.import("resource://gre/modules/XPCOMUtils.jsm", globalScope);
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", globalScope);
+ Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm", globalScope);
ScriptLoader.importModules([
"lib/utils",
"lib/utils/xul",
@@ -45,19 +45,19 @@ let rpWindowManager = (function(self) {
// import the WindowListener
Services.scriptloader.loadSubScript(
- "chrome://requestpolicy/content/main/window-manager.listener.js",
+ "chrome://rpcontinued/content/main/window-manager.listener.js",
globalScope);
let styleSheets = [
- "chrome://requestpolicy/skin/requestpolicy.css"
+ "chrome://rpcontinued/skin/requestpolicy.css"
];
if (Utils.info.isSeamonkey) {
- styleSheets.push("chrome://requestpolicy/skin/toolbarbutton-seamonkey.css");
+ styleSheets.push("chrome://rpcontinued/skin/toolbarbutton-seamonkey.css");
} else {
- styleSheets.push("chrome://requestpolicy/skin/toolbarbutton.css");
+ styleSheets.push("chrome://rpcontinued/skin/toolbarbutton.css");
}
- let frameScriptURI = "chrome://requestpolicy/content/ui/frame.js?" +
+ let frameScriptURI = "chrome://rpcontinued/content/ui/frame.js?" +
Math.random();
@@ -85,13 +85,13 @@ let rpWindowManager = (function(self) {
// ----------------------------------------------
try {
Services.scriptloader.loadSubScript(
- "chrome://requestpolicy/content/ui/overlay.js",
+ "chrome://rpcontinued/content/ui/overlay.js",
window);
Services.scriptloader.loadSubScript(
- "chrome://requestpolicy/content/ui/menu.js",
+ "chrome://rpcontinued/content/ui/menu.js",
window);
Services.scriptloader.loadSubScript(
- "chrome://requestpolicy/content/ui/classicmenu.js",
+ "chrome://rpcontinued/content/ui/classicmenu.js",
window);
} catch (e) {
Logger.warning(Logger.TYPE_ERROR,
@@ -233,5 +233,5 @@ let rpWindowManager = (function(self) {
// extend rpWindowManager
Services.scriptloader.loadSubScript(
- "chrome://requestpolicy/content/main/window-manager-toolbarbutton.js",
+ "chrome://rpcontinued/content/main/window-manager-toolbarbutton.js",
globalScope);
diff --git a/src/content/settings/advancedprefs.html b/src/content/settings/advancedprefs.html
index 8364d80..a268c94 100644
--- a/src/content/settings/advancedprefs.html
+++ b/src/content/settings/advancedprefs.html
@@ -2,10 +2,10 @@
<html>
<head>
<title>RequestPolicy - Advanced Preferences</title>
- <script src="chrome://requestpolicy/content/settings/jquery.min.js"></script>
- <script src="chrome://requestpolicy/content/settings/common.js"></script>
- <script src="chrome://requestpolicy/content/settings/advancedprefs.js"></script>
- <link href="chrome://requestpolicy/content/settings/settings.css"
+ <script src="chrome://rpcontinued/content/settings/jquery.min.js"></script>
+ <script src="chrome://rpcontinued/content/settings/common.js"></script>
+ <script src="chrome://rpcontinued/content/settings/advancedprefs.js"></script>
+ <link href="chrome://rpcontinued/content/settings/settings.css"
rel="stylesheet" type="text/css"/>
</head>
<body onload="onload()">
diff --git a/src/content/settings/basicprefs.html b/src/content/settings/basicprefs.html
index cd9db81..adfe6ea 100644
--- a/src/content/settings/basicprefs.html
+++ b/src/content/settings/basicprefs.html
@@ -2,10 +2,10 @@
<html>
<head>
<title>RequestPolicy - Preferences</title>
- <script src="chrome://requestpolicy/content/settings/jquery.min.js"></script>
- <script src="chrome://requestpolicy/content/settings/common.js"></script>
- <script src="chrome://requestpolicy/content/settings/basicprefs.js"></script>
- <link href="chrome://requestpolicy/content/settings/settings.css"
+ <script src="chrome://rpcontinued/content/settings/jquery.min.js"></script>
+ <script src="chrome://rpcontinued/content/settings/common.js"></script>
+ <script src="chrome://rpcontinued/content/settings/basicprefs.js"></script>
+ <link href="chrome://rpcontinued/content/settings/settings.css"
rel="stylesheet" type="text/css"/>
</head>
<body onload="onload()">
diff --git a/src/content/settings/common.js b/src/content/settings/common.js
index 0919023..efcb1df 100644
--- a/src/content/settings/common.js
+++ b/src/content/settings/common.js
@@ -5,7 +5,7 @@ const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
+Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm");
ScriptLoader.importModules([
"lib/utils/constants",
"lib/utils/strings",
diff --git a/src/content/settings/defaultpolicy.html b/src/content/settings/defaultpolicy.html
index cabc689..c271af0 100644
--- a/src/content/settings/defaultpolicy.html
+++ b/src/content/settings/defaultpolicy.html
@@ -2,10 +2,10 @@
<html>
<head>
<title>RequestPolicy - Default Policy</title>
- <script src="chrome://requestpolicy/content/settings/jquery.min.js"></script>
- <script src="chrome://requestpolicy/content/settings/common.js"></script>
- <script src="chrome://requestpolicy/content/settings/defaultpolicy.js"></script>
- <link href="chrome://requestpolicy/content/settings/settings.css"
+ <script src="chrome://rpcontinued/content/settings/jquery.min.js"></script>
+ <script src="chrome://rpcontinued/content/settings/common.js"></script>
+ <script src="chrome://rpcontinued/content/settings/defaultpolicy.js"></script>
+ <link href="chrome://rpcontinued/content/settings/settings.css"
rel="stylesheet" type="text/css"/>
</head>
<body onload="onload()">
diff --git a/src/content/settings/oldrules.html b/src/content/settings/oldrules.html
index 175cb33..a63e1f7 100644
--- a/src/content/settings/oldrules.html
+++ b/src/content/settings/oldrules.html
@@ -2,10 +2,10 @@
<html>
<head>
<title>RequestPolicy - Old Rules</title>
- <script src="chrome://requestpolicy/content/settings/jquery.min.js"></script>
- <script src="chrome://requestpolicy/content/settings/common.js"></script>
- <script src="chrome://requestpolicy/content/settings/oldrules.js"></script>
- <link href="chrome://requestpolicy/content/settings/settings.css"
+ <script src="chrome://rpcontinued/content/settings/jquery.min.js"></script>
+ <script src="chrome://rpcontinued/content/settings/common.js"></script>
+ <script src="chrome://rpcontinued/content/settings/oldrules.js"></script>
+ <link href="chrome://rpcontinued/content/settings/settings.css"
rel="stylesheet" type="text/css"/>
</head>
<body onload="onload()">
diff --git a/src/content/settings/setup.html b/src/content/settings/setup.html
index 1ce5880..a32591e 100644
--- a/src/content/settings/setup.html
+++ b/src/content/settings/setup.html
@@ -2,10 +2,10 @@
<html>
<head>
<title>RequestPolicy - Setup</title>
- <script src="chrome://requestpolicy/content/settings/jquery.min.js"></script>
- <script src="chrome://requestpolicy/content/settings/common.js"></script>
- <script src="chrome://requestpolicy/content/settings/setup.js"></script>
- <!--<link href="chrome://requestpolicy/content/settings/setup.css"
+ <script src="chrome://rpcontinued/content/settings/jquery.min.js"></script>
+ <script src="chrome://rpcontinued/content/settings/common.js"></script>
+ <script src="chrome://rpcontinued/content/settings/setup.js"></script>
+ <!--<link href="chrome://rpcontinued/content/settings/setup.css"
rel="stylesheet" type="text/css"/>-->
<style>
html {
diff --git a/src/content/settings/subscriptions.html b/src/content/settings/subscriptions.html
index 54e6135..43e14b0 100644
--- a/src/content/settings/subscriptions.html
+++ b/src/content/settings/subscriptions.html
@@ -2,10 +2,10 @@
<html>
<head>
<title>RequestPolicy - Subscriptions</title>
- <script src="chrome://requestpolicy/content/settings/jquery.min.js"></script>
- <script src="chrome://requestpolicy/content/settings/common.js"></script>
- <script src="chrome://requestpolicy/content/settings/subscriptions.js"></script>
- <link href="chrome://requestpolicy/content/settings/settings.css"
+ <script src="chrome://rpcontinued/content/settings/jquery.min.js"></script>
+ <script src="chrome://rpcontinued/content/settings/common.js"></script>
+ <script src="chrome://rpcontinued/content/settings/subscriptions.js"></script>
+ <link href="chrome://rpcontinued/content/settings/settings.css"
rel="stylesheet" type="text/css"/>
<style>
</style>
diff --git a/src/content/settings/yourpolicy.html b/src/content/settings/yourpolicy.html
index a3f8f0c..027471a 100644
--- a/src/content/settings/yourpolicy.html
+++ b/src/content/settings/yourpolicy.html
@@ -2,10 +2,10 @@
<html>
<head>
<title>RequestPolicy - Your Policy</title>
- <script src="chrome://requestpolicy/content/settings/jquery.min.js"></script>
- <script src="chrome://requestpolicy/content/settings/common.js"></script>
- <script src="chrome://requestpolicy/content/settings/yourpolicy.js"></script>
- <link href="chrome://requestpolicy/content/settings/settings.css"
+ <script src="chrome://rpcontinued/content/settings/jquery.min.js"></script>
+ <script src="chrome://rpcontinued/content/settings/common.js"></script>
+ <script src="chrome://rpcontinued/content/settings/yourpolicy.js"></script>
+ <link href="chrome://rpcontinued/content/settings/settings.css"
rel="stylesheet" type="text/css"/>
</head>
<body onload="onload()">
diff --git a/src/content/ui/classicmenu.js b/src/content/ui/classicmenu.js
index 0915048..acf76c3 100644
--- a/src/content/ui/classicmenu.js
+++ b/src/content/ui/classicmenu.js
@@ -34,7 +34,7 @@ requestpolicy.classicmenu = (function() {
let {ScriptLoader} = (function() {
let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm", mod);
return mod;
}());
let {rpPrefBranch} = ScriptLoader.importModule("lib/prefs");
diff --git a/src/content/ui/frame.js b/src/content/ui/frame.js
index b661ec3..cbfe8af 100644
--- a/src/content/ui/frame.js
+++ b/src/content/ui/frame.js
@@ -40,7 +40,7 @@ Components.utils.import("resource://gre/modules/devtools/Console.jsm");
// import some modules
let {ScriptLoader} = Cu.import(
- "chrome://requestpolicy/content/lib/script-loader.jsm", {});
+ "chrome://rpcontinued/content/lib/script-loader.jsm", {});
let mod = {};
ScriptLoader.importModules([
"lib/utils/constants",
@@ -81,10 +81,10 @@ Components.utils.import("resource://gre/modules/devtools/Console.jsm");
function loadSubScripts() {
Services.scriptloader.loadSubScript(
- 'chrome://requestpolicy/content/ui/frame.blocked-content.js',
+ 'chrome://rpcontinued/content/ui/frame.blocked-content.js',
framescriptScope);
Services.scriptloader.loadSubScript(
- 'chrome://requestpolicy/content/ui/frame.dom-content-loaded.js',
+ 'chrome://rpcontinued/content/ui/frame.dom-content-loaded.js',
framescriptScope);
}
framescriptEnv.addStartupFunction(Environment.LEVELS.ESSENTIAL,
diff --git a/src/content/ui/menu.js b/src/content/ui/menu.js
index d31fedd..6d57f53 100644
--- a/src/content/ui/menu.js
+++ b/src/content/ui/menu.js
@@ -31,7 +31,7 @@ requestpolicy.menu = (function() {
let {ScriptLoader} = (function() {
let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm", mod);
return mod;
}());
// iMod: Alias for ScriptLoader.importModule
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index da44344..45c371b 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -34,7 +34,7 @@ requestpolicy.overlay = (function() {
let {ScriptLoader, XPCOMUtils} = (function() {
let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm", mod);
Cu.import("resource://gre/modules/XPCOMUtils.jsm", mod);
return mod;
}());
@@ -1209,7 +1209,7 @@ requestpolicy.overlay = (function() {
if (requestLog.hidden) {
requestLogFrame.setAttribute("src",
- "chrome://requestpolicy/content/ui/request-log.xul");
+ "chrome://rpcontinued/content/ui/request-log.xul");
requestLog.hidden = requestLogSplitter.hidden = closeRequestLog.hidden = false;
//openRequestLog.hidden = true;
} else {
diff --git a/src/content/ui/request-log.filtering.js b/src/content/ui/request-log.filtering.js
index 2908378..9e7bcec 100644
--- a/src/content/ui/request-log.filtering.js
+++ b/src/content/ui/request-log.filtering.js
@@ -30,7 +30,7 @@ window.requestpolicy.requestLog = (function (self) {
let {ScriptLoader, Services} = (function() {
let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm", mod);
Cu.import("resource://gre/modules/Services.jsm", mod);
return mod;
}());
diff --git a/src/content/ui/request-log.interface.js b/src/content/ui/request-log.interface.js
index 941346b..6891f39 100644
--- a/src/content/ui/request-log.interface.js
+++ b/src/content/ui/request-log.interface.js
@@ -31,7 +31,7 @@ window.requestpolicy.requestLog = (function (self) {
let {ScriptLoader, Services} = (function() {
let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm", mod);
Cu.import("resource://gre/modules/Services.jsm", mod);
return mod;
}());
diff --git a/src/content/ui/request-log.js b/src/content/ui/request-log.js
index a60714e..3eb3705 100644
--- a/src/content/ui/request-log.js
+++ b/src/content/ui/request-log.js
@@ -31,7 +31,7 @@ window.requestpolicy.requestLog = (function (self) {
let {ScriptLoader} = (function() {
let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm", mod);
return mod;
}());
let {StringUtils} = ScriptLoader.importModule("lib/utils/strings");
diff --git a/src/content/ui/request-log.tree-view.js b/src/content/ui/request-log.tree-view.js
index 6f87f0d..c093e8a 100644
--- a/src/content/ui/request-log.tree-view.js
+++ b/src/content/ui/request-log.tree-view.js
@@ -32,7 +32,7 @@ window.requestpolicy.requestLog = (function (self) {
let {ScriptLoader} = (function() {
let mod = {};
- Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
+ Cu.import("chrome://rpcontinued/content/lib/script-loader.jsm", mod);
return mod;
}());
let {StringUtils} = ScriptLoader.importModule("lib/utils/strings");
@@ -135,7 +135,7 @@ window.requestpolicy.requestLog = (function (self) {
getImageSrc: function(aIndex, aColumn) {
if (self.columnNameToIndexMap[aColumn.id] == 2) {
if (getVisibleRowAtIndex(aIndex)[2]) {
- return "chrome://requestpolicy/skin/dot.png";
+ return "chrome://rpcontinued/skin/dot.png";
}
}
},
diff --git a/src/content/ui/request-log.xul b/src/content/ui/request-log.xul
index 46f2000..c5bd4ca 100644
--- a/src/content/ui/request-log.xul
+++ b/src/content/ui/request-log.xul
@@ -21,10 +21,10 @@
***** END LICENSE BLOCK *****
-->
-<!DOCTYPE page SYSTEM "chrome://requestpolicy/locale/requestpolicy.dtd">
+<!DOCTYPE page SYSTEM "chrome://rpcontinued/locale/requestpolicy.dtd">
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://requestpolicy/skin/request-log.css" type="text/css"?>
+<?xml-stylesheet href="chrome://rpcontinued/skin/request-log.css" type="text/css"?>
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/src/content/ui/xul-trees.js b/src/content/ui/xul-trees.js
index fab25d1..9bfda75 100644
--- a/src/content/ui/xul-trees.js
+++ b/src/content/ui/xul-trees.js
@@ -178,7 +178,7 @@ exports.mainTree = [
]}
]},
// The src of this iframe is set to
- // chrome://requestpolicy/content/ui/request-log.xul in overlay.js
+ // chrome://rpcontinued/content/ui/request-log.xul in overlay.js
{tag: "iframe", id: "requestpolicy-requestLog-frame", type: "chrome",
flex: "1"}
]}
diff --git a/src/install.rdf b/src/install.rdf
index 263c21b..aaefa1c 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -17,7 +17,7 @@
<em:homepageURL>https://requestpolicycontinued.github.io/</em:homepageURL>
<em:optionsURL>about:requestpolicy</em:optionsURL>
<em:optionsType>3</em:optionsType>
- <em:iconURL>chrome://requestpolicy/skin/requestpolicy-icon-32.png</em:iconURL>
+ <em:iconURL>chrome://rpcontinued/skin/requestpolicy-icon-32.png</em:iconURL>
<em:updateURL>https://requestpolicycontinued.github.io/xpi/update-1.x-beta.rdf</em:updateURL>
diff --git a/src/skin/initial-setup.css b/src/skin/initial-setup.css
index a258a12..f0450b6 100644
--- a/src/skin/initial-setup.css
+++ b/src/skin/initial-setup.css
@@ -6,7 +6,7 @@ dialog {
dialogheader {
padding-left: 40px;
background-image:
- url("chrome://requestpolicy/skin/requestpolicy-icon-24-blocked.png");
+ url("chrome://rpcontinued/skin/requestpolicy-icon-24-blocked.png");
background-repeat: no-repeat;
background-position: 6px center;
}
diff --git a/src/skin/requestpolicy.css b/src/skin/requestpolicy.css
index 0a6f07a..9e66328 100644
--- a/src/skin/requestpolicy.css
+++ b/src/skin/requestpolicy.css
@@ -49,13 +49,13 @@
#rp-blocked-destinations [default-policy="true"],
#rp-allowed-destinations [default-policy="true"] {
- background-image: url(chrome://requestpolicy/skin/menu-default.svg);
+ background-image: url(chrome://rpcontinued/skin/menu-default.svg);
}
#rp-blocked-destinations [default-policy="false"] {
- background-image: url(chrome://requestpolicy/skin/menu-blocked.svg);
+ background-image: url(chrome://rpcontinued/skin/menu-blocked.svg);
}
#rp-allowed-destinations [default-policy="false"] {
- background-image: url(chrome://requestpolicy/skin/menu-allowed.svg);
+ background-image: url(chrome://rpcontinued/skin/menu-allowed.svg);
}
#rp-blocked-destinations [default-policy],
#rp-allowed-destinations [default-policy] {
@@ -145,11 +145,11 @@
}
#rp-origin[requests-blocked="true"] {
background-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-blocked.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png);
}
#rp-origin[requests-blocked="false"] {
background-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-allowed.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-allowed.png);
}
#rp-origin[requests-blocked] {
background-position: left center;
@@ -169,11 +169,11 @@
}
#rp-other-origins [requests-blocked="true"] {
background-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-blocked.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png);
}
#rp-other-origins [requests-blocked="false"] {
background-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-allowed.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-allowed.png);
}
#rp-other-origins [requests-blocked] {
background-position: left center;
@@ -276,7 +276,7 @@
margin-right: 4px;
border: none !important;
background: transparent !important;
- list-style-image: url(chrome://requestpolicy/skin/close.png);
+ list-style-image: url(chrome://rpcontinued/skin/close.png);
-moz-image-region: rect(0px, 16px, 16px, 0px);
-moz-box-align: end;
}
diff --git a/src/skin/toolbarbutton-seamonkey.css b/src/skin/toolbarbutton-seamonkey.css
index cbbe439..816ca39 100644
--- a/src/skin/toolbarbutton-seamonkey.css
+++ b/src/skin/toolbarbutton-seamonkey.css
@@ -8,11 +8,11 @@
toolbar > toolbarpaletteitem #requestpolicyToolbarButton,
#palette-box #requestpolicyToolbarButton {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-32-blocked.png) !important;
+ url(chrome://rpcontinued/skin/requestpolicy-icon-32-blocked.png) !important;
}
toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-blocked.png) !important;
+ url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png) !important;
}
@@ -25,12 +25,12 @@ toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
/* default: */ toolbar #requestpolicyToolbarButton,
/* blocked: */ toolbar #requestpolicyToolbarButton[requestpolicyBlocked="true"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-32-blocked.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-32-blocked.png);
}
/* default: */ toolbar[iconsize="small"] #requestpolicyToolbarButton,
/* blocked: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyBlocked="true"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-blocked.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png);
}
@@ -41,11 +41,11 @@ toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
/* allowed: */ toolbar #requestpolicyToolbarButton[requestpolicyBlocked="false"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-32-allowed.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-32-allowed.png);
}
/* allowed: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyBlocked="false"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-allowed.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-allowed.png);
}
@@ -56,9 +56,9 @@ toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
toolbar #requestpolicyToolbarButton[requestpolicyPermissive="true"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-32-disabled.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-32-disabled.png);
}
toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyPermissive="true"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-disabled.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-disabled.png);
}
diff --git a/src/skin/toolbarbutton.css b/src/skin/toolbarbutton.css
index 370cc00..afe864b 100644
--- a/src/skin/toolbarbutton.css
+++ b/src/skin/toolbarbutton.css
@@ -5,18 +5,18 @@
/*
#requestpolicyContextMenu {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-allowed.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-allowed.png);
}
#requestpolicyContextMenu[requestpolicyBlocked="true"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-blocked.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png);
color: #a00;
}
#requestpolicyContextMenu[requestpolicyPermissive="true"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-disabled.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-disabled.png);
color: #d07100;
}
*/
@@ -70,17 +70,17 @@
toolbarpaletteitem #requestpolicyToolbarButton,
toolbar[iconsize="small"] > toolbarpaletteitem #requestpolicyToolbarButton {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-blocked.png) !important;
+ url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png) !important;
}
toolbar > toolbarpaletteitem #requestpolicyToolbarButton,
toolbar[iconsize="large"] > toolbarpaletteitem #requestpolicyToolbarButton {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-24-blocked.png) !important;
+ url(chrome://rpcontinued/skin/requestpolicy-icon-24-blocked.png) !important;
}
toolbarpaletteitem[place="palette"] #requestpolicyToolbarButton,
toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-32.png) !important;
+ url(chrome://rpcontinued/skin/requestpolicy-icon-32.png) !important;
}
@@ -94,13 +94,13 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
/* default: */ #requestpolicyToolbarButton[cui-areatype="menu-panel"],
/* blocked: */ #requestpolicyToolbarButton[cui-areatype="menu-panel"][requestpolicyBlocked="true"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-32.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-32.png);
}
/*** non-Australis only ***/
/* default: */ toolbar[iconsize="large"] #requestpolicyToolbarButton,
/* blocked: */ toolbar[iconsize="large"] #requestpolicyToolbarButton[requestpolicyBlocked="true"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-24-blocked.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-24-blocked.png);
}
/*** "normal" toolbars (16px icons) ***/
/** Australis: **/
@@ -110,7 +110,7 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
/* default: */ toolbar[iconsize="small"] #requestpolicyToolbarButton,
/* blocked: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyBlocked="true"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-blocked.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-blocked.png);
}
@@ -123,12 +123,12 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
/*** Australis only: (the new menu) ***/
/* allowed: */ #requestpolicyToolbarButton[cui-areatype="menu-panel"][requestpolicyBlocked="false"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-32-allowed.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-32-allowed.png);
}
/*** non-Australis only ***/
/* allowed: */ toolbar[iconsize="large"] #requestpolicyToolbarButton[requestpolicyBlocked="false"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-24-allowed.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-24-allowed.png);
}
/*** "normal" toolbars (16px icons) ***/
/** selectors for Australis **/
@@ -136,7 +136,7 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
/** selectors for non-Australis **/
/* allowed: */ toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyBlocked="false"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-allowed.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-allowed.png);
}
/*
@@ -147,12 +147,12 @@ toolbarpaletteitem[place="panel"] #requestpolicyToolbarButton {
/*** Australis only: (the new menu) ***/
#requestpolicyToolbarButton[cui-areatype="menu-panel"][requestpolicyPermissive="true"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-32-disabled.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-32-disabled.png);
}
/*** non-Australis only ***/
toolbar[iconsize="large"] #requestpolicyToolbarButton[requestpolicyPermissive="true"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-24-disabled.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-24-disabled.png);
}
/*** "normal" toolbars (16px icons) ***/
/** Australis: **/
@@ -160,5 +160,5 @@ toolbar[iconsize="large"] #requestpolicyToolbarButton[requestpolicyPermissive="t
/** non-Australis: **/
toolbar[iconsize="small"] #requestpolicyToolbarButton[requestpolicyPermissive="true"] {
list-style-image:
- url(chrome://requestpolicy/skin/requestpolicy-icon-disabled.png);
+ url(chrome://rpcontinued/skin/requestpolicy-icon-disabled.png);
}
diff --git a/tests/mozmill/extension/content/console-observer.jsm b/tests/mozmill/extension/content/console-observer.jsm
index e87d2fd..4ad7d8b 100644
--- a/tests/mozmill/extension/content/console-observer.jsm
+++ b/tests/mozmill/extension/content/console-observer.jsm
@@ -31,7 +31,7 @@ Cu.import("resource://gre/modules/Services.jsm");
var regEx = /(Error|Warning|Exception)/i;
function isRPException(aMessage) {
- if (aMessage.indexOf("chrome://requestpolicy") === -1 ||
+ if (aMessage.indexOf("chrome://rpcontinued") === -1 ||
regEx.test(aMessage) === false) {
return false;
}
diff --git a/tests/mozmill/highLevelTests/repeatedTests/detectErrors/testDetectingErrors.js b/tests/mozmill/highLevelTests/repeatedTests/detectErrors/testDetectingErrors.js
index dd238e6..56da704 100644
--- a/tests/mozmill/highLevelTests/repeatedTests/detectErrors/testDetectingErrors.js
+++ b/tests/mozmill/highLevelTests/repeatedTests/detectErrors/testDetectingErrors.js
@@ -11,7 +11,7 @@ var rootDir = rpRootDir + rpConst.mozmillTestsRootDir;
var {assert, expect} = require(rootDir + "lib/assertions");
var prefs = require(rootDir + "lib/prefs");
-Components.utils.import("chrome://requestpolicy/content/lib/logger.jsm");
+Components.utils.import("chrome://rpcontinued/content/lib/logger.jsm");
function setupModule(aModule) {
diff --git a/tests/mozmill/lib/request-log-utils.js b/tests/mozmill/lib/request-log-utils.js
index d6a0a50..1696d00 100644
--- a/tests/mozmill/lib/request-log-utils.js
+++ b/tests/mozmill/lib/request-log-utils.js
@@ -75,7 +75,7 @@ RequestLog.prototype.getDestinations = function () {
RequestLog.prototype.hasBeenAllowed = function (aRow) {
let imageSrc = this.treeView.getImageSrc(aRow, this.blockedCol);
- return imageSrc !== "chrome://requestpolicy/skin/dot.png";
+ return imageSrc !== "chrome://rpcontinued/skin/dot.png";
};
RequestLog.prototype.getRow = function(aRow) {
diff --git a/tests/xpcshell/head_loadrp.js b/tests/xpcshell/head_loadrp.js
index 53d505f..a51b47d 100644
--- a/tests/xpcshell/head_loadrp.js
+++ b/tests/xpcshell/head_loadrp.js
@@ -78,9 +78,9 @@ if (!requestpolicy) {
//// maybe this needs to be changed to:
//var loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
// .getService(Ci.mozIJSSubScriptLoader);
-//loader.loadSubScript("chrome://requestpolicy/content/lib/logger.jsm");
+//loader.loadSubScript("chrome://rpcontinued/content/lib/logger.jsm");
//// ? -- see https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Language_bindings/XPConnect/xpcshell/HOWTO
-Components.utils.import("chrome://requestpolicy/content/lib/logger.jsm");
+Components.utils.import("chrome://rpcontinued/content/lib/logger.jsm");
Logger.printFunc = function (msg) {
print(msg.trimRight());
}
diff --git a/tests/xpcshell/head_utils.js b/tests/xpcshell/head_utils.js
index 7c47b47..1106124 100644
--- a/tests/xpcshell/head_utils.js
+++ b/tests/xpcshell/head_utils.js
@@ -1,8 +1,8 @@
-Components.utils.import("chrome://requestpolicy/content/lib/file-util.jsm");
+Components.utils.import("chrome://rpcontinued/content/lib/file-util.jsm");
//// TODO: Maybe the script loader needs to be used instead?
//var loader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
// .getService(Components.interfaces.mozIJSSubScriptLoader);
-//loader.loadSubScript("chrome://requestpolicy/content/modules/FileUtil.jsm");
+//loader.loadSubScript("chrome://rpcontinued/content/modules/FileUtil.jsm");
function copyRulesetFileToProfile(filename, destFilename) {
if (!destFilename) {
diff --git a/tests/xpcshell/test_fileutil.js b/tests/xpcshell/test_fileutil.js
index 54a8f82..758d243 100644
--- a/tests/xpcshell/test_fileutil.js
+++ b/tests/xpcshell/test_fileutil.js
@@ -1,5 +1,5 @@
-Components.utils.import("chrome://requestpolicy/content/lib/file-util.jsm");
+Components.utils.import("chrome://rpcontinued/content/lib/file-util.jsm");
function run_test() {
// Make sure the RP user dir doesn't already exist.
diff --git a/tests/xpcshell/test_policymanager.js b/tests/xpcshell/test_policymanager.js
index 05c3208..b8f0dcd 100644
--- a/tests/xpcshell/test_policymanager.js
+++ b/tests/xpcshell/test_policymanager.js
@@ -1,6 +1,6 @@
-Components.utils.import("chrome://requestpolicy/content/lib/domain-util.jsm");
-Components.utils.import("chrome://requestpolicy/content/lib/ruleset.jsm");
-Components.utils.import("chrome://requestpolicy/content/lib/policy-manager.jsm");
+Components.utils.import("chrome://rpcontinued/content/lib/domain-util.jsm");
+Components.utils.import("chrome://rpcontinued/content/lib/ruleset.jsm");
+Components.utils.import("chrome://rpcontinued/content/lib/policy-manager.jsm");
var config = {
diff --git a/tests/xpcshell/test_policystorage.js b/tests/xpcshell/test_policystorage.js
index 868f6c3..b4b0c22 100644
--- a/tests/xpcshell/test_policystorage.js
+++ b/tests/xpcshell/test_policystorage.js
@@ -1,6 +1,6 @@
-Components.utils.import("chrome://requestpolicy/content/lib/ruleset.jsm");
-Components.utils.import("chrome://requestpolicy/content/lib/ruleset-storage.jsm");
+Components.utils.import("chrome://rpcontinued/content/lib/ruleset.jsm");
+Components.utils.import("chrome://rpcontinued/content/lib/ruleset-storage.jsm");
// We expect JSON data to represent the following data structure.
var exampleJsonObj = {
diff --git a/tests/xpcshell/test_subscription.js b/tests/xpcshell/test_subscription.js
index be5788c..81a1a76 100644
--- a/tests/xpcshell/test_subscription.js
+++ b/tests/xpcshell/test_subscription.js
@@ -1,5 +1,5 @@
-Components.utils.import("chrome://requestpolicy/content/lib/subscription.jsm");
+Components.utils.import("chrome://rpcontinued/content/lib/subscription.jsm");
function run_test() {
test_1();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git
More information about the Pkg-mozext-commits
mailing list