Permalink
Browse files

bug 740301: update repack config for partner repacks. r=tomcat

  • Loading branch information...
1 parent 3257640 commit e990d3f99012322286e2836bce7b3e49c566f8a5 @mozbhearsum mozbhearsum committed Jul 11, 2012
Showing 3,812 changed files with 41,216 additions and 34,358 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
View
@@ -2,7 +2,7 @@
[Global]
id=aol
-version=1.3
+version=2.2
about=Mozilla Firefox with AOL Toolbar
[Preferences]
@@ -14,8 +14,8 @@ app.partner.aol="aol"
browser.search.defaultenginename="AOL Search"
browser.search.order.1="AOL Search"
browser.search.order.2="Yahoo"
-browser.startup.homepage="http://firefox-startpage.aol.com/"
-browser.startup.homepage_reset="http://firefox-startpage.aol.com/"
+browser.startup.homepage="http://www.aol.com/?mtmhp=aolcustomfirefoxtoolbar&ncid=hyplognew00000006"
+browser.startup.homepage_reset="http://www.aol.com/\?mtmhp\=aolcustomfirefoxtoolbar\&ncid\=hyplognew00000006"
keyword.URL="http://search.aol.com/aol/search?s_it=tb50-ff-customfirefox-ab-en-us&q="
[BookmarksToolbar]
@@ -5,18 +5,23 @@ Comments: PLEASE DO NOT EDIT THIS FILE. YOU WILL BREAK IT.
Name: chrome/aoltoolbar.jar
Digest-Algorithms: MD5 SHA1
-MD5-Digest: gSDczNMVyzcuVjhtoYelSA==
-SHA1-Digest: UKb44ndujwHC8OfJp/nIS1J6XZo=
+MD5-Digest: QnjuWXX4KWEZoAwWoMQURg==
+SHA1-Digest: CpLopXQgmrHwjYmQxYwO5I7+LtI=
Name: chrome.manifest
Digest-Algorithms: MD5 SHA1
-MD5-Digest: JWC9xxvZ83SeEua8ay70dQ==
-SHA1-Digest: fdnX29lLYjVKlq78Dho387h9Afc=
+MD5-Digest: D9zqUcAv46cNAew1VtbrRQ==
+SHA1-Digest: yUZvSVEOFWUyoJQfdFJ7Ar3H7o0=
Name: components/aolAddonObserver.js
Digest-Algorithms: MD5 SHA1
-MD5-Digest: +shxL1lOCUsAr88L0Nox8A==
-SHA1-Digest: h6vWkVkhUVIKw15jVycpP5F6Apk=
+MD5-Digest: d0F98RgsZ19oRK2Ck8r1ag==
+SHA1-Digest: cycfSVMsjRG2W4h0zUYdst9GD9Y=
+
+Name: components/aolAutoSuggest.js
+Digest-Algorithms: MD5 SHA1
+MD5-Digest: IHc43MivmWZg3ffvUYk6dQ==
+SHA1-Digest: GoJwsLQyZKuZHzXukkjWFR7oS44=
Name: components/aolUninstallObserver.js
Digest-Algorithms: MD5 SHA1
@@ -33,12 +38,17 @@ Digest-Algorithms: MD5 SHA1
MD5-Digest: s5ra51Bk2jfYfN0e52qRRg==
SHA1-Digest: Mw0leAkrEBNEsYDbi8+SWiar66A=
+Name: components/mailcount.dll
+Digest-Algorithms: MD5 SHA1
+MD5-Digest: v2BfcqdVTinC/L91xCKW/g==
+SHA1-Digest: 28IQIViqjvJrnsJgiXLA/i4++cA=
+
Name: components/MailUtil.dll
Digest-Algorithms: MD5 SHA1
-MD5-Digest: koFWJYdAZY3j5WqVy+icZg==
-SHA1-Digest: lbK6IbfVINWZjqesyksJt/Qv9E8=
+MD5-Digest: wpQH6phxPb7rhJA27KW2Ag==
+SHA1-Digest: yAabNafskcFzYHF2XqBMWMROv48=
Name: install.rdf
Digest-Algorithms: MD5 SHA1
-MD5-Digest: IhLEhim7rL5ZlGjjm8sinA==
-SHA1-Digest: wlgchl8mD+Ixv3/8Q9/kzdcovhU=
+MD5-Digest: BqkPtDBKYNxlbWoLiORV5A==
+SHA1-Digest: 2tTgs6LKBi5dddy4Ie31PKNVkdY=
@@ -8,18 +8,23 @@ SHA1-Digest: jCy5+JoYHOK2bTDMyVwpC3zlf00=
Name: chrome/aoltoolbar.jar
Digest-Algorithms: MD5 SHA1
-MD5-Digest: vEPG6foR6QquxdumNxc7PA==
-SHA1-Digest: U7fr3R96ftc9JoU68pQ1PkN3Wyo=
+MD5-Digest: GOMz3eoiwUZsiurx69gsSA==
+SHA1-Digest: yCDC6+WvcGYgOiHJQSTbSlL0bfg=
Name: chrome.manifest
Digest-Algorithms: MD5 SHA1
-MD5-Digest: z5NxbQI2mMnU+gH9UJzj+w==
-SHA1-Digest: z62NEEATZBIIcULMrjXi1QP7tls=
+MD5-Digest: 6sweJ2UxbZNahYrjG+S0Zw==
+SHA1-Digest: kMRPTvfWeB4FzqDlBTt7VfwrfH0=
Name: components/aolAddonObserver.js
Digest-Algorithms: MD5 SHA1
-MD5-Digest: JWIU8mz0I9Zm5IiHqV2L9A==
-SHA1-Digest: 5d9JRsPBzTtDEwBnHZ89Sy3GNzA=
+MD5-Digest: A2DA6zfN+ZC7Ud3saswMAg==
+SHA1-Digest: Pc/bdLejUuh2CufX/hXArW0ElYQ=
+
+Name: components/aolAutoSuggest.js
+Digest-Algorithms: MD5 SHA1
+MD5-Digest: jHvzCTTPHgeSGkU2Iqlu0A==
+SHA1-Digest: AthIeCu2s2MPGq7/RZbSAeuhjSw=
Name: components/aolUninstallObserver.js
Digest-Algorithms: MD5 SHA1
@@ -36,12 +41,17 @@ Digest-Algorithms: MD5 SHA1
MD5-Digest: nMx40OByGELyWCpYRRGBxg==
SHA1-Digest: 2XAe+Dp72+Gq4r3YPuJjp+I/1NM=
+Name: components/mailcount.dll
+Digest-Algorithms: MD5 SHA1
+MD5-Digest: Hi+yl26vsGFRD/zfAdKQpg==
+SHA1-Digest: 5kpk+oWchzcE7ENVQmtpaCcUr4o=
+
Name: components/MailUtil.dll
Digest-Algorithms: MD5 SHA1
-MD5-Digest: ryJOKCeG0BIin3ZPwYNq7Q==
-SHA1-Digest: kvSSO+EGer6m1hI7sV3QW4kprSg=
+MD5-Digest: NMSJexayLR0CYGEKaqaJNA==
+SHA1-Digest: Vlj3eU/60e0JuFhKe/LhUTiRxWc=
Name: install.rdf
Digest-Algorithms: MD5 SHA1
-MD5-Digest: D3oD7st3aFfkKTwz9xvPzw==
-SHA1-Digest: oPsF488ZlydItbi6cZE2Cvkh1rM=
+MD5-Digest: xRc6fVpbBF8P5iKKG0XQbw==
+SHA1-Digest: GaSit2z+wKEAszIhl9k+J/hujk8=
@@ -4,11 +4,15 @@ skin aoltoolbar classic/1.0 jar:chrome/aoltoolbar.jar!/skin/
locale aoltoolbar en-US jar:chrome/aoltoolbar.jar!/locale/en-US/
# new Firefox 4.0 binary XPCOM registration
-interfaces components/IMailUtil.xpt
+interfaces components/IMailUtil.xpt
binary-component components/MailUtil.dll
+
# new Firefox 4.0 javascript component registration
# The {classID} here must match the classID in aolAddonObserver.js
component {cdcc6170-e19b-46a0-b3d1-4b66e348a538} components/aolAddonObserver.js
contract @toolbar.aol.com/aoladdonobserver;1 {cdcc6170-e19b-46a0-b3d1-4b66e348a538}
category profile-after-change aolAddonObserver @toolbar.aol.com/aoladdonobserver;1
+
+component {87c57a2d-6812-4ce1-9242-a1656bbe0d1e} components/aolAutoSuggest.js
+contract @mozilla.org/autocomplete/search;1?name=aol-search-suggest {87c57a2d-6812-4ce1-9242-a1656bbe0d1e}
@@ -18,6 +18,9 @@ aolAddonObserver.prototype =
_init : false,
_state : "",
+ _enable:true,
+ _chromeDir:'',
+ _hideToolbar:false,
classDescription : CLASS_NAME,
contractID : CONTRACT_ID,
@@ -50,6 +53,7 @@ aolAddonObserver.prototype =
// create the addon listener
AddonManager.addAddonListener(this.addonListener.init(this, TOOLBAR_ID));
+ this._chromeDir = "chrome://aoltoolbar/";
}
catch(e)
{
@@ -155,11 +159,18 @@ aolAddonObserver.prototype =
this.getBranch().deleteBranch("");
},
- uninstalling : function()
+ disabling:function(addon)
+ {
+ this._state = "Disable";
+ this.showUninstallPage(addon);
+ },
+
+
+ uninstalling : function(addon)
{
this.log('uninstalling');
this._state = "uninstalling";
- this.showUninstallPage();
+ this.showUninstallPage(addon);
},
installing : function()
@@ -200,6 +211,7 @@ aolAddonObserver.prototype =
onDisabling : function(addon, needsRestart)
{
this.observer.log('onDisabling:' + addon.name);
+ if (this.isSelf(addon.id)) this.observer.disabling(addon);
},
onDisabled : function(addon)
@@ -238,7 +250,7 @@ aolAddonObserver.prototype =
onUninstalling : function(addon, needsRestart)
{
this.observer.log('onUninstalling:' + addon.name);
- if (this.isSelf(addon.id)) this.observer.uninstalling();
+ if (this.isSelf(addon.id)) this.observer.uninstalling(addon);
},
onUninstalled : function(addon)
@@ -325,7 +337,49 @@ aolAddonObserver.prototype =
return uninstallUrl;
},
- showUninstallPage : function()
+ sendRequest:function(url) {
+ try {
+ var req = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance();
+ req.open("GET", url, false);
+ req.send(null);
+ } catch(e) {
+ this.log("sendRequest ex ["+ e.message +"] "+ url);
+ }
+ },
+
+ formatDate: function(val)
+ {
+ var ret = "20000101";
+ var parts = val.split("-");
+ if (parts.length == 3) {
+ ret = parts[2]+parts[1]+parts[0];
+ }
+ return ret;
+ },
+
+ sendSearch : function(typeName, subTypeName) {
+ var branch = this.getBranch();
+ var strings = this.getStrings();
+ var installId = branch.getCharPref("search.instd");
+ var originalDate = branch.getCharPref("search.oid");
+ var currentDate = branch.getCharPref("search.cid");
+ var langlocale = strings.GetStringFromName("toolbar.langlocale");
+ var installSource = branch.getCharPref("search.source");
+ var searchUrl = strings.GetStringFromName("search.metrics");
+
+ searchUrl = searchUrl.replace(/{it}/g, installSource);
+ searchUrl = searchUrl.replace(/{langlocale}/g, langlocale.toLowerCase());
+ searchUrl = searchUrl.replace(/{mrud}/g, this.formatDate(currentDate));
+ searchUrl = searchUrl.replace(/{oid}/g, this.formatDate(originalDate));
+ searchUrl = searchUrl.replace(/{uuid}/g, installId);
+
+ var evt = typeName + "-" + subTypeName;
+
+ var url = searchUrl.replace(/{event}/g, evt);
+
+ this.sendRequest(url);
+ },
+ showUninstallPage : function(addon)
{
try
{
@@ -334,8 +388,42 @@ aolAddonObserver.prototype =
if (windowMediator)
{
window = windowMediator.getMostRecentWindow("navigator:browser");
+ var branch = this.getBranch();
+ var strings = this.getStrings();
+
+ var xul_id = strings.GetStringFromName("toolbar.xul.id");
+ var tb = window.document.getElementById(xul_id);
+
+
if (window)
{
+ var path= this._chromeDir + "content/enableBox.xul";
+ window.openDialog(path, "aol", "modal,centerscreen,titlebar=no", this);
+
+ if(this._enable){
+
+ addon.userDisabled = false;
+ //if this is a user uninstall action. cancel uninstall
+ if((addon.pendingOperations & AddonManager.PENDING_UNINSTALL) != 0)
+ addon.cancelUninstall();
+
+ var branch = this.getBranch();
+ var strings = this.getStrings();
+
+ var xul_id = strings.GetStringFromName("toolbar.xul.id");
+ var tb = window.document.getElementById(xul_id);
+ if(tb && this._hideToolbar){
+ tb.collapsed = true;
+
+ this.sendSearch("prompt", "detect_disable-hide-this-session");
+ }
+ else{
+ this.sendSearch("prompt", "detect_disable-cancel-disable");
+ }
+
+ }
+ else{ //if uninstall , show uninstall url
+ this.sendSearch("prompt", "detect disable-disable toolbar");
var mainWindow = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIWebNavigation)
.QueryInterface(Components.interfaces.nsIDocShellTreeItem)
@@ -346,6 +434,7 @@ aolAddonObserver.prototype =
var uri = this.getUninstallUrl();
mainWindow.gBrowser.addTab(uri);
}
+ }
}
}
catch(e)
@@ -5,10 +5,10 @@
<em:creator>AOL Inc.</em:creator>
<em:description>AOL Toolbar for Firefox</em:description>
- <em:homepageURL>http://www.aol.com/?ncid=toolbar</em:homepageURL>
+ <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.6764</em:version>
+ <em:version>5.74.1.8400</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>4.*</em:maxVersion>
+ <em:maxVersion>17.0</em:maxVersion>
</Description>
</em:targetApplication>
@@ -1,6 +1,7 @@
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
<os:ShortName>AOL Search</os:ShortName>
<os:InputEncoding>UTF-8</os:InputEncoding>
+<os:Description>AOL Web Search</os:Description>
<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAALEAAABRAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKIAAAD/AAAA/wAAAOoAAACHAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAD8AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADAAAAAWgAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADDAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADtAAAAkwAAAC0AAAAAAAAAAAAAAAAAAABaAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAwwAAAAAAAAAMAAAA5AAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAN4AAAAA/////7Ozs/8AAAD/s7Oz//////8AAAD/s7Oz//z8/P+zs7P/AAAA/5mZmf//////AAAA///////BwcHsAAAAG9ra2v76+vr////////////Z2dn/s7Oz//////+zs7P//////7Ozs/+ZmZn//////wAAAP//////ycnJ4wAAAKWAgID//////wAAAP//////gICA//////+zs7P/AAAA/7Ozs///////mZmZ//////8AAAD/AAAA/wAAAIQAAADwQEBA/////////////////0BAQP+zs7P//////7Ozs///////s7Oz/5mZmf//////AAAA/wAAAP8AAABmAAAAjQAAAP+4uLj/+vr6/7i4uP8AAAD/AAAA/7Ozs///////s7Oz/wAAAP+ZmZn//////wAAAP8AAAD/AAAASAAAACQAAAD8TU1N//////9NTU3/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/mZmZ//////8AAAD/AAAA/wAAACoAAAAAAAAAsQAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAMAAAAAAAAAEUAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAPAAAAC0AAAAAAAAAAAAAAAAAAAA1QAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA+QAAAMMAAACQAAAAWgAAACcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGkAAAD/AAAAyQAAAJYAAABjAAAALQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8P8AAPA/AADgBwEA4AEAAMAAAACAAAAAgAAAAAAAAAAAAAAAAAAAQAAAAMAAAAAAgAABAIABAADABwAAwP8AAA==</os:Image>
<SearchForm>http://search.aol.com/</SearchForm>
<os:Url type="text/html" method="GET" template="http://search.aol.com/aol/search">
View
2 partners/aol/repack.cfg 100644 → 100755
@@ -1,6 +1,6 @@
aus="aol"
dist_id="aol"
-dist_version="1.3"
+dist_version="2.2"
linux-i686=true
locales="en-US"
mac=true
View
No changes.
View
1 partners/euballot/repack.cfg 100644 → 100755
@@ -5,4 +5,3 @@ linux-i686=false
locales="bg ca cs cy da de el en-GB es-ES et eu fi fr fy-NL ga-IE gl hr hu is it lt lv nb-NO nl nn-NO pl pt-PT ro ru sv-SE sk sl tr"
mac=false
win32=true
-output_dir="win32-EUballot/%(locale)s"
Oops, something went wrong.

0 comments on commit e990d3f

Please sign in to comment.