[Pkg-mozext-commits] [adblock-plus-element-hiding-helper] 387/483: Defining Cc & Co. in modules in no longer necessary

[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 4c0acb47b9fa1c1d1ede10e244ae6d4b2eb802ff
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Mon Jan 23 15:59:34 2012 +0100

    Defining Cc & Co. in modules in no longer necessary
---
 aardvark.js          |  4 ----
 inspectorObserver.js |  4 ----
 main.js              | 12 ++++--------
 windowWrapper.js     |  4 ----
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/aardvark.js b/aardvark.js
index c42bf90..7076952 100644
--- a/aardvark.js
+++ b/aardvark.js
@@ -4,10 +4,6 @@
  * http://mozilla.org/MPL/2.0/.
  */
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
 let {Prefs} = require("prefs");
 
 // To be replaced when selection starts
diff --git a/inspectorObserver.js b/inspectorObserver.js
index 0718aed..bca581b 100644
--- a/inspectorObserver.js
+++ b/inspectorObserver.js
@@ -4,10 +4,6 @@
  * http://mozilla.org/MPL/2.0/.
  */
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
diff --git a/main.js b/main.js
index bb860fb..b5d6c0d 100644
--- a/main.js
+++ b/main.js
@@ -4,21 +4,17 @@
  * http://mozilla.org/MPL/2.0/.
  */
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {Prefs} = require("prefs");
 let {WindowObserver} = require("windowObserver");
 let {WindowWrapper} = require("windowWrapper");
 
-Prefs.init("extensions.elemhidehelper.", {
-  "extensions.adblockplus.ehh-selectelement_key": "selectelement_key",
-  "extensions.adblockplus.ehh.showhelp": "showhelp"
-});
+// Check whether some preferences can still be found under their old locations
+Prefs.migrate("extensions.adblockplus.ehh-selectelement_key", "selectelement_key");
+Prefs.migrate("extensions.adblockplus.ehh.showhelp", "showhelp");
 
+// Make sure to stop selection when we are uninstalled
 onShutdown.add(function() require("aardvark").Aardvark.quit());
 
 // Use random marker class
diff --git a/windowWrapper.js b/windowWrapper.js
index 29e27a9..88aaa61 100644
--- a/windowWrapper.js
+++ b/windowWrapper.js
@@ -4,10 +4,6 @@
  * http://mozilla.org/MPL/2.0/.
  */
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
 let {Aardvark} = require("aardvark");
 let {Prefs} = require("prefs");
 let {KeySelector} = require("keySelector");

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