[Pkg-mozext-commits] [adblock-plus] 19/22: Revert "Store preferences to its default path"
David Prévot
taffit at moszumanska.debian.org
Thu Jun 5 14:01:10 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit dd80162b8ac38cad982be29bab75087418b598d4
Author: David Prévot <taffit at debian.org>
Date: Wed Jun 4 13:31:46 2014 -0400
Revert "Store preferences to its default path"
This reverts commit 64bb51e78eb52c8ecc205cab21dbe2e1c1712966.
---
...003-Store-preferences-to-its-default-path.patch | 128 ---------------------
debian/patches/series | 1 -
2 files changed, 129 deletions(-)
diff --git a/debian/patches/0003-Store-preferences-to-its-default-path.patch b/debian/patches/0003-Store-preferences-to-its-default-path.patch
deleted file mode 100644
index d0eb16d..0000000
--- a/debian/patches/0003-Store-preferences-to-its-default-path.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Fri, 16 May 2014 21:30:17 -0400
-Subject: Store preferences to its default path
-
-Bug-Debian: https://bugs.debian.org/684390
-Bug: https://adblockplus.org/forum/viewtopic.php?f=11&t=16529
-Forwarded: https://github.com/adblockplus/adblockplus/pull/4 https://github.com/adblockplus/buildtools/pull/1
----
- buildtools/lib/prefs.js | 2 +-
- buildtools/packagerGecko.py | 2 +-
- defaults/preferences/prefs.js | 37 +++++++++++++++++++++++++++++++++++++
- defaults/prefs.js | 37 -------------------------------------
- 4 files changed, 39 insertions(+), 39 deletions(-)
- create mode 100644 defaults/preferences/prefs.js
- delete mode 100644 defaults/prefs.js
-
-diff --git a/buildtools/lib/prefs.js b/buildtools/lib/prefs.js
-index e1b6ae0..c16710d 100644
---- a/buildtools/lib/prefs.js
-+++ b/buildtools/lib/prefs.js
-@@ -43,7 +43,7 @@ function init()
- defineProperty(pref, false, getter, setter);
- }
- };
-- Services.scriptloader.loadSubScript(addonRoot + "defaults/prefs.js", scope);
-+ Services.scriptloader.loadSubScript(addonRoot + "defaults/preferences/prefs.js", scope);
-
- // Add preference change observer
- try
-diff --git a/buildtools/packagerGecko.py b/buildtools/packagerGecko.py
-index ab73145..2279511 100644
---- a/buildtools/packagerGecko.py
-+++ b/buildtools/packagerGecko.py
-@@ -212,7 +212,7 @@ def addMissingFiles(params, files):
- templateData['hasChromeRequires'] = True
- if name.startswith('lib/') and re.search(r'\bXMLHttpRequest\b', content):
- templateData['hasXMLHttpRequest'] = True
-- if name == 'defaults/prefs.js':
-+ if name == 'defaults/preferences/prefs.js':
- if re.search(r'\.currentVersion"', content):
- templateData['hasVersionPref'] = True
- if not '/' in name or name.startswith('lib/'):
-diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
-new file mode 100644
-index 0000000..9503dce
---- /dev/null
-+++ b/defaults/preferences/prefs.js
-@@ -0,0 +1,37 @@
-+// For description of these values see http://adblockplus.org/en/preferences
-+
-+pref("extensions.adblockplus.currentVersion", "0.0");
-+pref("extensions.adblockplus.enabled", true);
-+pref("extensions.adblockplus.frameobjects", true);
-+pref("extensions.adblockplus.fastcollapse", false);
-+pref("extensions.adblockplus.showinstatusbar", false);
-+pref("extensions.adblockplus.detachsidebar", false);
-+pref("extensions.adblockplus.defaulttoolbaraction", 0);
-+pref("extensions.adblockplus.defaultstatusbaraction", 0);
-+pref("extensions.adblockplus.sidebar_key", "Accel Shift V, Accel Shift U");
-+pref("extensions.adblockplus.sendReport_key", "");
-+pref("extensions.adblockplus.filters_key", "Accel Shift E, Accel Shift F, Accel Shift O");
-+pref("extensions.adblockplus.enable_key", "");
-+pref("extensions.adblockplus.flash_scrolltoitem", true);
-+pref("extensions.adblockplus.previewimages", true);
-+pref("extensions.adblockplus.data_directory", "adblockplus");
-+pref("extensions.adblockplus.patternsbackups", 5);
-+pref("extensions.adblockplus.patternsbackupinterval", 24);
-+pref("extensions.adblockplus.whitelistschemes", "about chrome file irc moz-safe-about news resource snews x-jsd addbook cid imap mailbox nntp pop data javascript moz-icon");
-+pref("extensions.adblockplus.subscriptions_autoupdate", true);
-+pref("extensions.adblockplus.subscriptions_listurl", "https://adblockplus.org/subscriptions2.xml");
-+pref("extensions.adblockplus.subscriptions_fallbackurl", "https://adblockplus.org/getSubscription?version=%VERSION%&url=%SUBSCRIPTION%&downloadURL=%URL%&error=%ERROR%&channelStatus=%CHANNELSTATUS%&responseStatus=%RESPONSESTATUS%");
-+pref("extensions.adblockplus.subscriptions_fallbackerrors", 5);
-+pref("extensions.adblockplus.subscriptions_exceptionsurl", "https://easylist-downloads.adblockplus.org/exceptionrules.txt");
-+pref("extensions.adblockplus.subscriptions_exceptionscheckbox", true);
-+pref("extensions.adblockplus.documentation_link", "https://adblockplus.org/redirect?link=%LINK%&lang=%LANG%");
-+pref("extensions.adblockplus.savestats", true);
-+pref("extensions.adblockplus.composer_default", 2);
-+pref("extensions.adblockplus.clearStatsOnHistoryPurge", true);
-+pref("extensions.adblockplus.report_submiturl", "https://reports.adblockplus.org/submitReport?version=1&guid=%GUID%&lang=%LANG%");
-+pref("extensions.adblockplus.recentReports", []);
-+pref("extensions.adblockplus.hideContributeButton", false);
-+pref("extensions.adblockplus.blockableItemsSize", {width: 200, height: 200});
-+pref("extensions.adblockplus.notificationurl", "https://notification.adblockplus.org/notification.json");
-+pref("extensions.adblockplus.notificationdata", {});
-+pref("extensions.adblockplus.subscriptions_antiadblockurl", "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt");
-diff --git a/defaults/prefs.js b/defaults/prefs.js
-deleted file mode 100644
-index 9503dce..0000000
---- a/defaults/prefs.js
-+++ /dev/null
-@@ -1,37 +0,0 @@
--// For description of these values see http://adblockplus.org/en/preferences
--
--pref("extensions.adblockplus.currentVersion", "0.0");
--pref("extensions.adblockplus.enabled", true);
--pref("extensions.adblockplus.frameobjects", true);
--pref("extensions.adblockplus.fastcollapse", false);
--pref("extensions.adblockplus.showinstatusbar", false);
--pref("extensions.adblockplus.detachsidebar", false);
--pref("extensions.adblockplus.defaulttoolbaraction", 0);
--pref("extensions.adblockplus.defaultstatusbaraction", 0);
--pref("extensions.adblockplus.sidebar_key", "Accel Shift V, Accel Shift U");
--pref("extensions.adblockplus.sendReport_key", "");
--pref("extensions.adblockplus.filters_key", "Accel Shift E, Accel Shift F, Accel Shift O");
--pref("extensions.adblockplus.enable_key", "");
--pref("extensions.adblockplus.flash_scrolltoitem", true);
--pref("extensions.adblockplus.previewimages", true);
--pref("extensions.adblockplus.data_directory", "adblockplus");
--pref("extensions.adblockplus.patternsbackups", 5);
--pref("extensions.adblockplus.patternsbackupinterval", 24);
--pref("extensions.adblockplus.whitelistschemes", "about chrome file irc moz-safe-about news resource snews x-jsd addbook cid imap mailbox nntp pop data javascript moz-icon");
--pref("extensions.adblockplus.subscriptions_autoupdate", true);
--pref("extensions.adblockplus.subscriptions_listurl", "https://adblockplus.org/subscriptions2.xml");
--pref("extensions.adblockplus.subscriptions_fallbackurl", "https://adblockplus.org/getSubscription?version=%VERSION%&url=%SUBSCRIPTION%&downloadURL=%URL%&error=%ERROR%&channelStatus=%CHANNELSTATUS%&responseStatus=%RESPONSESTATUS%");
--pref("extensions.adblockplus.subscriptions_fallbackerrors", 5);
--pref("extensions.adblockplus.subscriptions_exceptionsurl", "https://easylist-downloads.adblockplus.org/exceptionrules.txt");
--pref("extensions.adblockplus.subscriptions_exceptionscheckbox", true);
--pref("extensions.adblockplus.documentation_link", "https://adblockplus.org/redirect?link=%LINK%&lang=%LANG%");
--pref("extensions.adblockplus.savestats", true);
--pref("extensions.adblockplus.composer_default", 2);
--pref("extensions.adblockplus.clearStatsOnHistoryPurge", true);
--pref("extensions.adblockplus.report_submiturl", "https://reports.adblockplus.org/submitReport?version=1&guid=%GUID%&lang=%LANG%");
--pref("extensions.adblockplus.recentReports", []);
--pref("extensions.adblockplus.hideContributeButton", false);
--pref("extensions.adblockplus.blockableItemsSize", {width: 200, height: 200});
--pref("extensions.adblockplus.notificationurl", "https://notification.adblockplus.org/notification.json");
--pref("extensions.adblockplus.notificationdata", {});
--pref("extensions.adblockplus.subscriptions_antiadblockurl", "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt");
diff --git a/debian/patches/series b/debian/patches/series
index 96be348..335425d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
0001-Disable-acceptable-ads-feature-by-default.patch
0002-No-focus-on-new-tab.patch
-0003-Store-preferences-to-its-default-path.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list