[Pkg-mozext-commits] [cookie-monster] 02/05: Imported Upstream version 1.3.0.5
David Prévot
taffit at moszumanska.debian.org
Fri Mar 25 23:16:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository cookie-monster.
commit 2ea58fdf31a7a7c64a61f32bdef18a6185524f07
Author: David Prévot <david at tilapin.org>
Date: Fri Mar 25 19:08:24 2016 -0400
Imported Upstream version 1.3.0.5
---
META-INF/manifest.mf | 8 ++++----
META-INF/mozilla.rsa | Bin 4197 -> 4196 bytes
META-INF/mozilla.sf | 4 ++--
.../cookiemonster.jar!/content/cookiePreferences.js | 19 ++++++++++++-------
chrome/cookiemonster.jar!/content/overlay.xul | 2 +-
install.rdf | 7 ++++---
6 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/META-INF/manifest.mf b/META-INF/manifest.mf
index dbe1420..962f312 100644
--- a/META-INF/manifest.mf
+++ b/META-INF/manifest.mf
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Name: install.rdf
Digest-Algorithms: MD5 SHA1
-MD5-Digest: buD+IqeYgGvnvnccTloQsw==
-SHA1-Digest: yI5tCsiXU1sdch8WA4kDMtrKB+8=
+MD5-Digest: Gn8PPxM4zxPeSk0nQk9EoQ==
+SHA1-Digest: kV1FjVy7tU75LJ1BGkBh9mhMLzs=
Name: chrome.manifest
Digest-Algorithms: MD5 SHA1
@@ -12,8 +12,8 @@ SHA1-Digest: 1sWOPYdQCbQiRQMP5nHUneyinKQ=
Name: chrome/cookiemonster.jar
Digest-Algorithms: MD5 SHA1
-MD5-Digest: ottpY/DYVOvuwQ1ekm3n8w==
-SHA1-Digest: zXeQiRqkpFPqZAErFfZ4MXm8h+8=
+MD5-Digest: 2cZDxPdSh86C2Po+WmECnQ==
+SHA1-Digest: 4+wGDI9C8/BX+Qz8qvrXNAAew+g=
Name: defaults/preferences/defaults.js
Digest-Algorithms: MD5 SHA1
diff --git a/META-INF/mozilla.rsa b/META-INF/mozilla.rsa
index a2242a6..a7e1ab9 100644
Binary files a/META-INF/mozilla.rsa and b/META-INF/mozilla.rsa differ
diff --git a/META-INF/mozilla.sf b/META-INF/mozilla.sf
index faf8a50..829f5af 100644
--- a/META-INF/mozilla.sf
+++ b/META-INF/mozilla.sf
@@ -1,4 +1,4 @@
Signature-Version: 1.0
-MD5-Digest-Manifest: 3hDMAyzdx4nBtOxphaOYzQ==
-SHA1-Digest-Manifest: EwxId86ms7lNmnobMHLBWinC3c8=
+MD5-Digest-Manifest: DbhLEkDTVN0EGuaLlb97Mg==
+SHA1-Digest-Manifest: arIb68wtFvPFtt4zjUD7kwi8qD8=
diff --git a/chrome/cookiemonster.jar!/content/cookiePreferences.js b/chrome/cookiemonster.jar!/content/cookiePreferences.js
index 54e9325..2e25410 100644
--- a/chrome/cookiemonster.jar!/content/cookiePreferences.js
+++ b/chrome/cookiemonster.jar!/content/cookiePreferences.js
@@ -11,14 +11,19 @@ cookieMonsterBys1tony.nsPreferences =
{
if (this._branch != undefined)
{
- return Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefBranch)
- .getBranch(this._branch);
+ var prefService = Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefService);
+
+ return prefService.getBranch(this._branch);
+
+ //return Components.classes["@mozilla.org/preferences-service;1"]
+ // .getService(Components.interfaces.nsIPrefBranch)
+ // .getBranch(this._branch);
}
else
{
return Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefBranch);
+ .getService(Components.interfaces.nsIPrefService);
}
},
@@ -259,7 +264,7 @@ cookieMonsterBys1tony.prefObserver =
var resultPolicy = new Array(-1, -1);
var prefService = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefBranch)
+ .getService(Components.interfaces.nsIPrefService)
.getBranch("network.cookie.");
resultPolicy[CM_PREF_COOKIE_BEHAVIOR] = prefService.getIntPref("cookieBehavior");
@@ -275,7 +280,7 @@ cookieMonsterBys1tony.prefObserver =
var resultPolicy = null;
var prefService = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefBranch)
+ .getService(Components.interfaces.nsIPrefService)
.getBranch("network.cookie.");
var cookieBehavior = prefService.getIntPref("cookieBehavior");
@@ -322,7 +327,7 @@ cookieMonsterBys1tony.prefObserver =
var resultPolicy = new Array(-1, -1);
var prefService = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefBranch)
+ .getService(Components.interfaces.nsIPrefService)
.getBranch("network.cookie.");
try
diff --git a/chrome/cookiemonster.jar!/content/overlay.xul b/chrome/cookiemonster.jar!/content/overlay.xul
index f907c77..7d2f200 100644
--- a/chrome/cookiemonster.jar!/content/overlay.xul
+++ b/chrome/cookiemonster.jar!/content/overlay.xul
@@ -127,7 +127,7 @@
<!-- Shortcut Keys to Menu -->
<keyset>
- <key id="cookiemonster-s1tony-key" modifiers="control,alt" key="m" oncommand="cookieMonsterBys1tony.showCookiesMenu.onKeyboardShortcut(event);"/>
+ <key id="cookiemonster-s1tony-key" modifiers="control,alt" key="c" oncommand="cookieMonsterBys1tony.showCookiesMenu.onKeyboardShortcut(event);"/>
</keyset>
</overlay>
diff --git a/install.rdf b/install.rdf
index 560d8f9..26711f3 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,8 +5,9 @@
<Description about="urn:mozilla:install-manifest">
<em:id>{45d8ff86-d909-11db-9705-005056c00008}</em:id>
- <em:version>1.3.0.0</em:version>
+ <em:version>1.3.0.5</em:version>
<em:type>2</em:type>
+ <em:unpack>true</em:unpack>
<em:optionsURL>chrome://cookiemonster/content/options.xul</em:optionsURL>
<!-- <em:iconURL>chrome://cookiemonster/skin/face-monkey.png</em:iconURL> -->
<em:iconURL>chrome://cookiemonster/skin/cookie-monster-logo-bigger.png</em:iconURL>
@@ -16,8 +17,8 @@
<em:targetApplication> <!-- Firefox -->
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
- <em:minVersion>6.0</em:minVersion>
- <em:maxVersion>42.*</em:maxVersion>
+ <em:minVersion>37.0</em:minVersion>
+ <em:maxVersion>45.*</em:maxVersion>
</Description>
</em:targetApplication>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/cookie-monster.git
More information about the Pkg-mozext-commits
mailing list