Permalink
Browse files

bug 826179: update Partner Configuration for Firefox 18.x.

  • Loading branch information...
BavarianTomcat committed Jan 3, 2013
1 parent 994de70 commit 7aaa7c89199f3d4641b021bde5487ce582ec82ab
Showing 388 changed files with 4,907 additions and 6,037 deletions.
@@ -5,8 +5,8 @@ Comments: PLEASE DO NOT EDIT THIS FILE. YOU WILL BREAK IT.
Name: chrome/aoltoolbar.jar
Digest-Algorithms: MD5 SHA1
-MD5-Digest: 3B73uUsEL/++z2AvXn5gLg==
-SHA1-Digest: EzIBb6V6+ioXm7pei+TETC+ZOMw=
+MD5-Digest: KGDw9bUiZap3lcGPMfAwcA==
+SHA1-Digest: QkVxnZV3rBxGczuCzS2g9cn/Ia8=
Name: chrome.manifest
Digest-Algorithms: MD5 SHA1
@@ -20,8 +20,8 @@ SHA1-Digest: yeHqo0OlcMIcmAOzhP1siGb5ouo=
Name: components/aolAutoSuggest.js
Digest-Algorithms: MD5 SHA1
-MD5-Digest: AwYiqGkC1/OxoCSkUM+zWA==
-SHA1-Digest: 0T4FYsBSHFpJVhF8Pqpi5dTrAFk=
+MD5-Digest: 6dJTAz7+GC1fOuPUArxBng==
+SHA1-Digest: drr5/9glj0KZbZAyw5ReSQhx1Gg=
Name: components/aolUninstallObserver.js
Digest-Algorithms: MD5 SHA1
@@ -50,5 +50,5 @@ SHA1-Digest: yAabNafskcFzYHF2XqBMWMROv48=
Name: install.rdf
Digest-Algorithms: MD5 SHA1
-MD5-Digest: 2yobVaTdp4NAOMkh1SUnSw==
-SHA1-Digest: +pZL5C/3EVZ0ycTbdaPFY08+8B0=
+MD5-Digest: ck7pyN2t7l9oXIBHv7qQBA==
+SHA1-Digest: 9IbuI/7O3a0F3sz7c5GoA/K6bYc=
@@ -8,8 +8,8 @@ SHA1-Digest: jCy5+JoYHOK2bTDMyVwpC3zlf00=
Name: chrome/aoltoolbar.jar
Digest-Algorithms: MD5 SHA1
-MD5-Digest: OCYzEu3Fgjai/YPl8DOTAg==
-SHA1-Digest: Zi+MLTzZeravkcp/lNf9x3xf4u4=
+MD5-Digest: RbMnfHxaFZF56mFFDDYekg==
+SHA1-Digest: L5tF53m5YpLJFLAudZm5yWJRII4=
Name: chrome.manifest
Digest-Algorithms: MD5 SHA1
@@ -23,8 +23,8 @@ SHA1-Digest: NwLE//ktIc8IfgdqZWGLCGkpkcc=
Name: components/aolAutoSuggest.js
Digest-Algorithms: MD5 SHA1
-MD5-Digest: xbUJBVmg4RIr18pe8URwnQ==
-SHA1-Digest: N6L4EJbL/Q2PDATfYHu6s8TMvSM=
+MD5-Digest: kTEdXvGFHpwnPKzp9BjSJg==
+SHA1-Digest: QzuYxSxv7BVbjTRbUgBYAPG+sso=
Name: components/aolUninstallObserver.js
Digest-Algorithms: MD5 SHA1
@@ -53,5 +53,5 @@ SHA1-Digest: Vlj3eU/60e0JuFhKe/LhUTiRxWc=
Name: install.rdf
Digest-Algorithms: MD5 SHA1
-MD5-Digest: zi9QHXpokyTBdvPE6M38VA==
-SHA1-Digest: GEiGei59XRjY3sYrnogOGXTz5QQ=
+MD5-Digest: zppqw+1WxWMqIr4T5Zzpqg==
+SHA1-Digest: LffRiQQP3Z83s6eymzRluiPW0oE=
@@ -5,7 +5,7 @@ g=C.ID("87c57a2d-6812-4ce1-9242-a1656bbe0d1e"),
Ci=C.interfaces,
Cc=C.classes,
Cg=Ci.nsIComponentRegistrar;
-var JSON = Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON);
+
const PROPS = "chrome://aoltoolbar/locale/toolbar_props.properties";
@@ -58,7 +58,7 @@ gS.prototype={
var r=[],
rT = q.responseText,
suggestions = "";
- json_suggestions = JSON.decode(rT);
+ json_suggestions = JSON.parse(rT);
if (json_suggestions.length >1) {
suggestions = json_suggestions[1];
}
@@ -67,8 +67,13 @@ gS.prototype={
l.onSearchResult(j,new gR(Ci.nsIAutoCompleteResult.RESULT_SUCCESS,r));
};
- var strings = this.getStrings();
- var api = strings.GetStringFromName("autosuggest.url") + encodeURIComponent(s) +"&output=json";
+ var strings = this.getStrings();
+ var branch = this.getBranch();
+ var api = strings.GetStringFromName("autosuggest.url") ;
+ api = api.replace(/&/g,"&");
+ var installSource = branch.getCharPref("search.source");
+ api = api.replace(/%b/g , installSource);
+ api = api.replace(/{searchTerms}/g, encodeURIComponent(s));
q.open('GET',api,true);
q.send(null);
},
@@ -8,7 +8,7 @@
<em:homepageURL>http://toolbar.aol.com/aol/customfirefox</em:homepageURL>
<em:id>{7affbfae-c4e2-4915-8c0f-00fa3ec610a1}</em:id>
<em:name>AOL Toolbar</em:name>
- <em:version>5.74.1.8927</em:version>
+ <em:version>5.74.1.9081</em:version>
<em:optionsURL>chrome://aoltoolbar/content/settings.xul</em:optionsURL>
<em:iconURL>chrome://aoltoolbar/locale/images/icon.png</em:iconURL>
<em:updateURL>https://client.web.aol.com/toolbarfiles/Prod/Content/customfirefox/ffhostfiles/update.rdf</em:updateURL>
@@ -18,7 +18,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>1.0</em:minVersion>
- <em:maxVersion>17.*</em:maxVersion>
+ <em:maxVersion>20.*</em:maxVersion>
</Description>
</em:targetApplication>
@@ -5,8 +5,8 @@ Comments: PLEASE DO NOT EDIT THIS FILE. YOU WILL BREAK IT.
Name: chrome/aoluktoolbar.jar
Digest-Algorithms: MD5 SHA1
-MD5-Digest: ibQFik9QShn+QllD/8mNnw==
-SHA1-Digest: REnl+DG0Uj7/6rwP6YCjsbsySgs=
+MD5-Digest: o44kbl2Cj9pA8dPyH4z+Og==
+SHA1-Digest: wGNzxGsAySHGTPbZuBB2yIdVTno=
Name: chrome.manifest
Digest-Algorithms: MD5 SHA1
@@ -50,5 +50,5 @@ SHA1-Digest: yAabNafskcFzYHF2XqBMWMROv48=
Name: install.rdf
Digest-Algorithms: MD5 SHA1
-MD5-Digest: MKGqLZgaSbnc9SFxTCy+MA==
-SHA1-Digest: O7L+E5vQfDh/4K2Pj2FokmzFQL4=
+MD5-Digest: evHnkn4Zof9d7BAaEHGyLw==
+SHA1-Digest: gEgj23gLLE88b8hqsGhyIV3yg3k=
@@ -8,8 +8,8 @@ SHA1-Digest: jCy5+JoYHOK2bTDMyVwpC3zlf00=
Name: chrome/aoluktoolbar.jar
Digest-Algorithms: MD5 SHA1
-MD5-Digest: k6XxmZllZtIHyQu7/tX7+Q==
-SHA1-Digest: X1SokQMHoaeUst2kv19V+FUE+8k=
+MD5-Digest: DI06bUK7WSZt8UEaKCkgAw==
+SHA1-Digest: nYlLicfHzGpB9frP2hf9wZPzNWA=
Name: chrome.manifest
Digest-Algorithms: MD5 SHA1
@@ -53,5 +53,5 @@ SHA1-Digest: Vlj3eU/60e0JuFhKe/LhUTiRxWc=
Name: install.rdf
Digest-Algorithms: MD5 SHA1
-MD5-Digest: mBf88ljLTAFXAOEESvSs1w==
-SHA1-Digest: gPPvORhM+J2UKn4x06G651BrJJA=
+MD5-Digest: 16/VDfuU8vjlOBT2uwdS5w==
+SHA1-Digest: 3axd8OrB8jmfFWmtOnm96R2w14Q=
@@ -8,17 +8,17 @@
<em:homepageURL>http://toolbar.aol.com/aoluk/aoluk-ff</em:homepageURL>
<em:id>{12e57d18-f8f7-4b76-af63-605365ab88ec}</em:id>
<em:name>AOL UK Toolbar</em:name>
- <em:version>5.91.1.8945</em:version>
+ <em:version>5.91.1.9095</em:version>
<em:optionsURL>chrome://aoluktoolbar/content/settings.xul</em:optionsURL>
<em:iconURL>chrome://aoluktoolbar/locale/images/icon.png</em:iconURL>
- <em:updateURL>https://client.web.aol.com/toolbarfiles/Prod/Content/aoluk/ffhostfiles/update.rdf</em:updateURL>
+ <em:updateURL>https://client.web.aol.com/toolbarfiles/Prod/Content/customffocuk/ffhostfiles/update.rdf</em:updateURL>
<em:aboutURL>chrome://aoluktoolbar/content/aboutBox.xul</em:aboutURL>
<em:targetApplication>
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>1.0</em:minVersion>
- <em:maxVersion>*.*</em:maxVersion>
+ <em:maxVersion>20.*</em:maxVersion>
</Description>
</em:targetApplication>
@@ -48,7 +48,7 @@ overlay chrome://unitedtb/content/pref/pref-general.xul chrome://unitedtb/cont
overlay chrome://unitedtb/content/pref/pref-general.xul chrome://unitedtb/content/pref/pref-updates.xul
component {aec3bc83-0b7d-4612-b625-4f22070a9b33} components/mCollectAutoComplete.js
-contract @mozilla.org/autocomplete/search;1?name=mcollect {aec3bc83-0b7d-4612-b625-4f22070a9b33}
+contract @mozilla.org/autocomplete/search;1?name=unitedinternet-mcollect {aec3bc83-0b7d-4612-b625-4f22070a9b33}
component {49c4f409-eaf5-4c4d-a96a-280a60c7c6b7} components/aboutNetError.js
contract @mozilla.org/network/protocol/about;1?what=neterror {49c4f409-eaf5-4c4d-a96a-280a60c7c6b7}
@@ -1,5 +1,5 @@
-// FF4 only
-//Components.utils.import("resource://unitedtb/util/util.js");
+Components.utils.import("resource://unitedtb/util/util.js");
+Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
const Ci = Components.interfaces;
const Cc = Components.classes;
@@ -12,17 +12,12 @@ AboutHandler.prototype =
/* nsIAboutModule */
newChannel : function (aURI)
{
- //FF4: var enabled = ourPref.get("neterror.enabled");
- var ioService = Cc["@mozilla.org/network/io-service;1"]
- .getService(Ci.nsIIOService);
- var prefService = Cc["@mozilla.org/preferences-service;1"]
- .getService(Ci.nsIPrefBranch);
- var enabled = prefService.getBoolPref("extensions.unitedinternet.neterror.enabled");
+ var enabled = ourPref.get("neterror.enabled");
var queryString = aURI.spec.substr(aURI.spec.indexOf('?')+1);
var url = /^e=dnsNotFound/.test(queryString) && enabled
? "chrome://unitedtb/content/neterror/neterror.xhtml?"
: "chrome://global/content/netError.xhtml?";
- return ioService.newChannel(url + queryString, null, null);
+ return Services.io.newChannel(url + queryString, null, null);
},
getURIFlags : function getURIFlags(aURI)
@@ -36,7 +31,4 @@ AboutHandler.prototype =
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
};
-if (XPCOMUtils.generateNSGetFactory) // FF4
- var NSGetFactory = XPCOMUtils.generateNSGetFactory([AboutHandler]);
-else // FF3.6
- var NSGetModule = XPCOMUtils.generateNSGetModule([AboutHandler]);
+var NSGetFactory = XPCOMUtils.generateNSGetFactory([AboutHandler]);
@@ -1,44 +1,10 @@
-// FF3.6 loads components before reading chrome.manifest,
-// so resource://unitedtb/ is not available. chrome:// isn't either for Cu.import in FF3.6.
-// So, wait for "app-startup" and do Cu.import then.
-// <http://blog.docuverse.com/2009/07/23/firefox-extension-developer-tips/>
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
const Cc = Components.classes;
const Ci = Components.interfaces;
-if (XPCOMUtils.generateNSGetFactory) // FF4
-{
- Components.utils.import("resource://unitedtb/util/util.js");
- Components.utils.import("resource://unitedtb/util/sanitizeDatatypes.js");
- Components.utils.import("resource://unitedtb/search/mcollect/mCollectImport.js");
-}
-else // FF3.6
-{
- let top = this;
- function Load()
- {
- }
- Load.prototype =
- {
- observe : function(subject, topic, data)
- {
- if (topic != "app-startup")
- return;
- Components.utils.import("resource://unitedtb/util/util.js", top);
- Components.utils.import("resource://unitedtb/util/sanitizeDatatypes.js", top);
- Components.utils.import("resource://unitedtb/search/mcollect/mCollectImport.js", top);
- },
- // nsICategoryManager registration
- // <https://developer.mozilla.org/en/XPCOMUtils.jsm>
- _xpcom_categories: [{
- category: "app-startup",
- }],
- classDescription: "mCollect autocomplete: Delayed load for FF3.6",
- contractID: "@mozilla.org/autocomplete/mcollect-load",
- classID: Components.ID("{a7a9cfee-3681-4c0a-9383-005ec380b6ce}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
- };
-}
+Components.utils.import("resource://unitedtb/util/util.js");
+Components.utils.import("resource://unitedtb/util/sanitizeDatatypes.js");
+Components.utils.import("resource://unitedtb/search/mcollect/mCollectImport.js");
/**
* @param engine {mSearch}
@@ -74,11 +40,7 @@ Results.prototype =
}
// call listeners
- if (this._acListener.onUpdateSearchResult) // FF4
- this._acListener.onUpdateSearchResult(this._acSearch, this);
- // TODO call onSearchResult() for FF4, too? When?
- else // FF3.6
- this._acListener.onSearchResult(this._acSearch, this);
+ this._acListener.onUpdateSearchResult(this._acSearch, this);
},
/**
@@ -272,13 +234,10 @@ mCollectAutoComplete.prototype =
},
classDescription: "AutoComplete from mCollect search engines",
- contractID: "@mozilla.org/autocomplete/search;1?name=mcollect",
+ contractID: "@mozilla.org/autocomplete/search;1?name=unitedinternet-mcollect",
classID: Components.ID("{aec3bc83-0b7d-4612-b625-4f22070a9b33}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteSearch,
Ci.nsIAutoCompleteObserver])
};
-if (XPCOMUtils.generateNSGetFactory) // FF4
- var NSGetFactory = XPCOMUtils.generateNSGetFactory([mCollectAutoComplete]);
-else // FF3.6
- var NSGetModule = XPCOMUtils.generateNSGetModule([mCollectAutoComplete, Load]);
+var NSGetFactory = XPCOMUtils.generateNSGetFactory([mCollectAutoComplete]);
@@ -305,7 +305,6 @@ login : {
providerID : "gmx",
domains : [ "gmx.net", "gmx.de", "gmx.at", "gmx.ch",
"gmx.co.uk", "gmx.fr", "gmx.it",
- "gmx.com",
"gmx.eu", "gmx.info", "gmx.biz", "gmx.tm", "gmx.org",
"imail.de", ],
type : "unitedinternet",
@@ -323,7 +322,7 @@ login : {
},
{
providerID : "mailcom",
- domains : [ "mail.com",
+ domains : [ "mail.com", "gmx.com",
"email.com", "usa.com", "consultant.com", "myself.com",
"london.com", "europe.com", "post.com", "dr.com", "doctor.com",
"lawyer.com", "engineer.com", "techie.com", "linuxmail.org",
@@ -1,6 +1,6 @@
const EXPORTED_SYMBOLS = ["version", "EMID", "kDebug", "kVariant", "ourEMIDs", ];
-const version = "2.3.4";
+const version = "2.4";
const EMID = "toolbar@gmx.net";
// show debug dump statement on OS console and JS console
const kDebug = false;
@@ -42,6 +42,7 @@
const EXPORTED_SYMBOLS = [ "Account", "BaseStandardAccount" ];
+Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://unitedtb/util/util.js");
Components.utils.import("resource://unitedtb/util/sanitizeDatatypes.js");
Components.utils.import("resource://unitedtb/util/observer.js");
@@ -286,7 +287,8 @@ BaseStandardAccount.prototype =
this._password = sanitize.string(password);
if ( !this._wantStoredLogin)
return;
- loginManager.addLogin(new LoginInfo(
+ // nsILoginManager (same below)
+ Services.logins.addLogin(new LoginInfo(
this.kType + "://" + this.hostname, null, "mailcheck",
this.username, password,
"", "")); // username and password field name
@@ -295,7 +297,7 @@ BaseStandardAccount.prototype =
_getPasswordFromStore : function()
{
this._password = "";
- for each (let login in loginManager.findLogins({},
+ for each (let login in Services.logins.findLogins({},
this.kType + "://" + this.hostname, null, "mailcheck"))
if (login.username == this.username)
this._password = sanitize.string(login.password);
@@ -305,10 +307,10 @@ BaseStandardAccount.prototype =
_deleteStoredPassword : function()
{
this._password = "";
- for each (let login in loginManager.findLogins({},
+ for each (let login in Services.logins.findLogins({},
this.kType + "://" + this.hostname, null, "mailcheck"))
if (login.username == this.username)
- loginManager.removeLogin(login);
+ Services.logins.removeLogin(login);
},
_verifyAccountSettings : function()
@@ -382,7 +384,5 @@ BaseStandardAccount.prototype =
}
extend(BaseStandardAccount, Account);
-XPCOMUtils.defineLazyServiceGetter(this, "loginManager",
- "@mozilla.org/login-manager;1", "nsILoginManager");
const LoginInfo = new Components.Constructor(
"@mozilla.org/login-manager/loginInfo;1", Ci.nsILoginInfo, "init");
Oops, something went wrong.

0 comments on commit 7aaa7c8

Please sign in to comment.