[Pkg-mozext-commits] [adblock-plus] 242/464: Moved prefs.js from a subdirectory of defaults/ directly into the defaults/ directory

[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.

commit 7cfc6361fed83929a5b86030ec52c3cbef814058
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Thu Jun 14 16:42:40 2012 +0200

    Moved prefs.js from a subdirectory of defaults/ directly into the defaults/ directory
---
 lib/prefs.js | 2 +-
 packager.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/prefs.js b/lib/prefs.js
index a5937a7..1a8da8b 100644
--- a/lib/prefs.js
+++ b/lib/prefs.js
@@ -32,7 +32,7 @@ function init()
       defineProperty(pref, false, getter, setter);
     }
   };
-  Services.scriptloader.loadSubScript(addonRoot + "defaults/preferences/prefs.js", scope);
+  Services.scriptloader.loadSubScript(addonRoot + "defaults/prefs.js", scope);
 
   // Add preference change observer
   try
diff --git a/packager.py b/packager.py
index c62de61..d5d3f10 100644
--- a/packager.py
+++ b/packager.py
@@ -238,7 +238,7 @@ def addMissingFiles(baseDir, params, files):
       templateData['requires'][match.group(1)] = True
       if name.startswith('chrome/content/'):
         templateData['hasChromeRequires'] = True
-    if name == 'defaults/preferences/prefs.js':
+    if name == 'defaults/prefs.js':
       if re.search(r'\.currentVersion"', content):
         templateData['hasVersionPref'] = True
     if not '/' in name or name.startswith('lib/'):

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