diff -u8pdNr exten-030/chrome/content/prefs.js exten-031/chrome/content/prefs.js --- exten-030/chrome/content/prefs.js 2009-02-28 14:40:12.000000000 +0100 +++ exten-031/chrome/content/prefs.js 2009-04-08 22:16:40.000000000 +0200 @@ -57,17 +57,17 @@ function onLoadTinderstatusPrefsPane() Ci.nsISupportsString).data; var gotoTreePref = gPrefBranch.getComplexValue("gotoTree", Ci.nsISupportsString).data; fullList = fullList.split(","); var i; var watchList = [ { element: document.getElementById("watchList"), pref: gPrefBranch.getComplexValue("watchList", - Ci.nsISupportsString).data + Ci.nsISupportsString).data.split(",") } ]; for (i = 1; i < kNumWatchLists; ++i) { var item = { element: document.getElementById("watchList" + i) }; try { var prefString = gPrefBranch.getComplexValue("watchList" + i, Ci.nsISupportsString).data; item.pref = prefString.split(","); diff -u8pdNr exten-030/chrome/content/tinderstatus.js exten-031/chrome/content/tinderstatus.js --- exten-030/chrome/content/tinderstatus.js 2009-02-28 17:17:10.000000000 +0100 +++ exten-031/chrome/content/tinderstatus.js 2009-04-09 01:11:36.000000000 +0200 @@ -83,16 +83,80 @@ var Tinderstatus = { // This flag is used so that we don't update the tinderboxQueryList whilst // we're in the middle of a set of queries _tinderboxListUpdateRequired: true, // The set of tinderboxes we need to check to cover all icons. tinderboxQueryList: [], init: function() { + // If we haven't yet converted references to the Firefox3.1 tree into + // references to the Firefox3.5 tree (to which it was renamed), do so now. + // FIXME: remove this code after everyone has updated to Tinderstatus 0.3.1 + // or a newer version. + if (!this._prefs.getBoolPref("renamed_Firefox3.1_to_Firefox3.5")) { + var i = 0, watchList = "watchList"; + // Go through watchlist prefs and update the ones with user set values. + while (this._prefs.getPrefType(watchList) != Ci.nsIPrefBranch.PREF_INVALID) { + if (this._prefs.prefHasUserValue(watchList)) { + var oldWatchList = this._prefs.getComplexValue(watchList, Ci.nsISupportsString).data; + var newWatchList = Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString); + newWatchList.data = + oldWatchList.split(","). // split into array of trees + map(function(v) v == "Firefox3.1" ? "Firefox3.5" : v). // Firefox3.1 -> Firefox3.5 + sort(). // sort to enable duplicate filtration + filter(function(v, i, a) i == 0 || v != a[i-1]). // remove duplicates (i.e. Firefox3.5 twice) + join(","); // join into string of trees + this._prefs.setComplexValue(watchList, Ci.nsISupportsString, newWatchList); + } + watchList = "watchList" + ++i; + } + + var i = 0, fullList = "fullList"; + var oldFullList = this._prefs.getComplexValue("fullList", + Ci.nsISupportsString).data; + var newFullList = Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString); + newFullList.data = + oldFullList.split(","). + map(function(v) v == "Firefox3.1" ? "Firefox3.5" : v). + sort(). + filter(function(v, i, a) i == 0 || v != a[i-1]). + join(","); + this._prefs.setComplexValue(fullList, Ci.nsISupportsString, newFullList); + fullList = "fullList" + ++i; + + var i = 0, fullListApplications = "fullList.applications"; + var oldFullListApplications = this._prefs.getComplexValue("fullList.applications", + Ci.nsISupportsString).data; + var newFullListApplications = Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString); + newFullListApplications.data = + oldFullListApplications.split(","). + map(function(v) v == "Firefox3.1" ? "Firefox3.5" : v). + sort(). + filter(function(v, i, a) i == 0 || v != a[i-1]). + join(","); + this._prefs.setComplexValue(fullListApplications, Ci.nsISupportsString, newFullListApplications); + fullListApplications = "fullList.applications" + ++i; + + var i = 0, gotoTree = "gotoTree"; + var oldGotoTree = this._prefs.getComplexValue("gotoTree", + Ci.nsISupportsString).data; + var newGotoTree = Cc["@mozilla.org/supports-string;1"].createInstance(Ci.nsISupportsString); + newGotoTree.data = + oldGotoTree.split(","). + map(function(v) v == "Firefox3.1" ? "Firefox3.5" : v). + sort(). + filter(function(v, i, a) i == 0 || v != a[i-1]). + join(","); + this._prefs.setComplexValue(gotoTree, Ci.nsISupportsString, newGotoTree); + gotoTree = "gotoTree" + ++i; + + this._prefs.setBoolPref("renamed_Firefox3.1_to_Firefox3.5", true); + } + this._numTrees = this._prefs.getIntPref("numTrees"); // Must have at least one tree. if (this._numTrees <= 0) this._numTrees = 1; let prefValue = "" try { prefValue = Tinderstatus._prefs.getComplexValue("watchList", Ci.nsISupportsString).data; @@ -279,17 +343,17 @@ function setUpTinderboxMenuPopup() { // Get the full list of tinderboxes that we know about. var fullList; try { fullList = Tinderstatus._prefs.getComplexValue("fullList", Ci.nsISupportsString).data; } catch (ex) { - fullList = "Bugzilla,Camino,Firefox,Firefox-Ports,Firefox3.0,Firefox3.1,Mobile,SeaMonkey,SeaMonkey-Ports,Sunbird,Thunderbird,Thunderbird3.0,XULRunner"; + fullList = "Bugzilla,Camino,Firefox,Firefox-Ports,Firefox3.0,Firefox3.5,Mobile,SeaMonkey,SeaMonkey-Ports,Sunbird,Thunderbird,Thunderbird3.0,XULRunner"; } fullList = fullList.split(","); // Now add the tinderboxes onto the menu var item; for (var i = 0; i < fullList.length; ++i) { item = document.createElement("menuitem"); diff -u8pdNr exten-030/defaults/preferences/tinderstatus.js exten-031/defaults/preferences/tinderstatus.js --- exten-030/defaults/preferences/tinderstatus.js 2009-02-28 10:28:16.000000000 +0100 +++ exten-031/defaults/preferences/tinderstatus.js 2009-04-08 22:34:12.000000000 +0200 @@ -1,7 +1,8 @@ pref("extensions.{CE49928A-7804-4688-8C9E-ABCBC7FB9BCF}.description", "chrome://tinderstatus/locale/tinderstatus.properties"); -pref("extensions.tinderstatus.fullList", "Bugzilla,Camino,Firefox,Firefox-Ports,Firefox3.0,Firefox3.1,Mobile,SeaMonkey,SeaMonkey-Ports,Sunbird,Thunderbird,Thunderbird3.0,XULRunner"); -pref("extensions.tinderstatus.fullList.applications", "Bugzilla,Bugzilla2.20,Bugzilla2.22,Bugzilla3.0,Bugzilla3.2,Camino,Firefox,Firefox-Ports,Firefox-Staging,Firefox3.0,Firefox3.1,LeakTest,Mobile,Mozilla1.8,Mozilla1.8-SeaMonkey,Mozilla1.8-Staging,Mozilla2,MozillaExperimental,MozillaRelease,MozillaStaging,MozillaTest,MozillaTest-BACKUP,MozillaTestBroken,MozillaTestBroken2,MozillaTry,NSS,NSS-Stable-Branch,SeaMonkey,SeaMonkey-Ports,Sunbird,Sunbird-Mozilla1.8,Testing,Thunderbird,Thunderbird3.0,TraceMonkeyUnitTest,XULRunner"); +pref("extensions.tinderstatus.fullList", "Bugzilla,Camino,Firefox,Firefox-Ports,Firefox3.0,Firefox3.5,Mobile,SeaMonkey,SeaMonkey-Ports,Sunbird,Thunderbird,Thunderbird3.0,XULRunner"); +pref("extensions.tinderstatus.fullList.applications", "Bugzilla,Bugzilla2.20,Bugzilla2.22,Bugzilla3.0,Bugzilla3.2,Camino,Firefox,Firefox-Ports,Firefox-Staging,Firefox3.0,Firefox3.5,LeakTest,Mobile,Mozilla1.8,Mozilla1.8-SeaMonkey,Mozilla1.8-Staging,Mozilla2,MozillaExperimental,MozillaRelease,MozillaStaging,MozillaTest,MozillaTest-BACKUP,MozillaTestBroken,MozillaTestBroken2,MozillaTry,NSS,NSS-Stable-Branch,SeaMonkey,SeaMonkey-Ports,Sunbird,Sunbird-Mozilla1.8,Testing,Thunderbird,Thunderbird3.0,TraceMonkeyUnitTest,XULRunner"); pref("extensions.tinderstatus.fullList.localizations", "Mozilla-l10n,Mozilla-l10n-af,Mozilla-l10n-ar,Mozilla-l10n-be,Mozilla-l10n-bg,Mozilla-l10n-bn-IN,Mozilla-l10n-ca,Mozilla-l10n-cs,Mozilla-l10n-da,Mozilla-l10n-de,Mozilla-l10n-el,Mozilla-l10n-en-GB,Mozilla-l10n-en-ZA,Mozilla-l10n-eo,Mozilla-l10n-es-AR,Mozilla-l10n-es-ES,Mozilla-l10n-eu,Mozilla-l10n-fa,Mozilla-l10n-fi,Mozilla-l10n-fr,Mozilla-l10n-fy-NL,Mozilla-l10n-ga-IE,Mozilla-l10n-gu-IN,Mozilla-l10n-he,Mozilla-l10n-hi-IN,Mozilla-l10n-hu,Mozilla-l10n-hy-AM,Mozilla-l10n-id,Mozilla-l10n-it,Mozilla-l10n-ja,Mozilla-l10n-ja-JP-mac,Mozilla-l10n-ka,Mozilla-l10n-kn,Mozilla-l10n-ko,Mozilla-l10n-ku,Mozilla-l10n-lt,Mozilla-l10n-lv,Mozilla-l10n-mk,Mozilla-l10n-ml,Mozilla-l10n-mn,Mozilla-l10n-mr,Mozilla-l10n-ms,Mozilla-l10n-nb-NO,Mozilla-l10n-ne-NP,Mozilla-l10n-nl,Mozilla-l10n-nn-NO,Mozilla-l10n-pa-IN,Mozilla-l10n-pl,Mozilla-l10n-pt-BR,Mozilla-l10n-pt-PT,Mozilla-l10n-ro,Mozilla-l10n-ru,Mozilla-l10n-rw,Mozilla-l10n-si,Mozilla-l10n-sk,Mozilla-l10n-sl,Mozilla-l10n-sq,Mozilla-l10n-sr,Mozilla-l10n-sv-SE,Mozilla-l10n-ta,Mozilla-l10n-ta-LK,Mozilla-l10n-te,Mozilla-l10n-tr,Mozilla-l10n-uk,Mozilla-l10n-vi,Mozilla-l10n-zh-CN,Mozilla-l10n-zh-TW,Mozilla1.8-l10n,Mozilla1.8-l10n-af,Mozilla1.8-l10n-ar,Mozilla1.8-l10n-be,Mozilla1.8-l10n-bg,Mozilla1.8-l10n-ca,Mozilla1.8-l10n-cs,Mozilla1.8-l10n-da,Mozilla1.8-l10n-de,Mozilla1.8-l10n-el,Mozilla1.8-l10n-en-GB,Mozilla1.8-l10n-en-ZA,Mozilla1.8-l10n-es-AR,Mozilla1.8-l10n-es-ES,Mozilla1.8-l10n-eu,Mozilla1.8-l10n-fi,Mozilla1.8-l10n-fr,Mozilla1.8-l10n-fy-NL,Mozilla1.8-l10n-ga-IE,Mozilla1.8-l10n-gu-IN,Mozilla1.8-l10n-he,Mozilla1.8-l10n-hu,Mozilla1.8-l10n-hy-AM,Mozilla1.8-l10n-it,Mozilla1.8-l10n-ja,Mozilla1.8-l10n-ja-JP-mac,Mozilla1.8-l10n-ka,Mozilla1.8-l10n-ko,Mozilla1.8-l10n-ku,Mozilla1.8-l10n-lt,Mozilla1.8-l10n-mk,Mozilla1.8-l10n-mn,Mozilla1.8-l10n-nb-NO,Mozilla1.8-l10n-nl,Mozilla1.8-l10n-nn-NO,Mozilla1.8-l10n-nr,Mozilla1.8-l10n-nso,Mozilla1.8-l10n-pa-IN,Mozilla1.8-l10n-pl,Mozilla1.8-l10n-pt-BR,Mozilla1.8-l10n-pt-PT,Mozilla1.8-l10n-ro,Mozilla1.8-l10n-ru,Mozilla1.8-l10n-sk,Mozilla1.8-l10n-sl,Mozilla1.8-l10n-sq,Mozilla1.8-l10n-ss,Mozilla1.8-l10n-st,Mozilla1.8-l10n-sv-SE,Mozilla1.8-l10n-tn,Mozilla1.8-l10n-tr,Mozilla1.8-l10n-ts,Mozilla1.8-l10n-uk,Mozilla1.8-l10n-ve,Mozilla1.8-l10n-xh,Mozilla1.8-l10n-zh-CN,Mozilla1.8-l10n-zh-TW,Mozilla1.8-l10n-zu"); -pref("extensions.tinderstatus.watchList", "Camino,Firefox,Firefox3.0,Firefox3.1,Mobile,SeaMonkey,Thunderbird,Thunderbird3.0,XULRunner"); +pref("extensions.tinderstatus.watchList", "Camino,Firefox,Firefox3.0,Firefox3.5,Mobile,SeaMonkey,Thunderbird,Thunderbird3.0,XULRunner"); pref("extensions.tinderstatus.gotoTree", "Firefox"); pref("extensions.tinderstatus.refreshTime", 1); +pref("extensions.tinderstatus.renamed_Firefox3.1_to_Firefox3.5", false); diff -u8pdNr exten-030/install.js exten-031/install.js --- exten-030/install.js 2009-02-28 12:30:46.000000000 +0100 +++ exten-031/install.js 2009-04-08 22:23:24.000000000 +0200 @@ -1,9 +1,9 @@ -initInstall("Tinderstatus Extended", "/mozdev/tinderstatus", "0.3"); +initInstall("Tinderstatus Extended", "/mozdev/tinderstatus", "0.3.1"); var chromeDir = getFolder("Profile", "chrome"); // Specify the directory into which we're going to install the extension. var installDir = getFolder(chromeDir, "tinderstatus"); setPackageFolder(installDir); // Specify the directory into which we're going to install the content files, diff -u8pdNr exten-030/install.rdf exten-031/install.rdf --- exten-030/install.rdf 2009-04-04 12:50:16.000000000 +0200 +++ exten-031/install.rdf 2009-04-08 22:24:22.000000000 +0200 @@ -1,43 +1,43 @@ Tinderstatus Extended {CE49928A-7804-4688-8C9E-ABCBC7FB9BCF} - 0.3 + 0.3.1 icon showing the status of Mozilla tinderboxen Myk Melez Alex Vincent Mark Banner Frédéric Buclin http://tinderstatus.mozdev.org/ chrome://tinderstatus/content/prefs.xul http://www.nadelundhirn.de/krams/exten/tinderstatus/update.rdf MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJ9vts188WYuHxbA5Dmj8H1F7b4JoGolHIQKWVixZfnyQg9Qq2FDjXGwEFAtowO6bXHnB+PuLBD/LpbqcJEcTSjQkziYsjmduiQVQcLcmv6Jc1dN6H0XuOTRDIAmfxVQewjJm8yYQIf6F93MZdPeSZ5gWBl7s29h8WcjMHglLfmwIDAQAB {ec8030f7-c20a-464f-9b0e-13a3a9e97384} 3.0pre - 3.1b3pre + 3.6a1pre {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} 2.0a1 - 2.0a3 + 2.0b1 {718e30fb-e89b-41dd-9da7-e25a45638b28} 1.0pre