commit 30c900dd4b6ad0bdfe9ede50c031424006ab9c23 Author: Mike Perry mikeperry-git@fscked.org Date: Wed Jan 16 17:08:30 2013 -0800
Switch our addon ID to something human readable. --- makexpi.sh | 6 ++-- src/chrome/content/torbutton_util.js | 4 +- src/chrome/locale/en/torbutton.properties | 2 +- src/defaults/preferences/preferences.js | 5 +-- src/install.rdf | 43 +++++++++++++++------------- 5 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/makexpi.sh b/makexpi.sh index 42479c3..0180684 100755 --- a/makexpi.sh +++ b/makexpi.sh @@ -1,7 +1,7 @@ -#!/bin/bash +#!/bin/sh APP_NAME=torbutton -VERSION=`grep em:version src/install.rdf | sed -e 's/["]//g' | cut -f2 -d=` -XPI_NAME=$APP_NAME-$VERSION.xpi +#VERSION=`grep em:version src/install.rdf | sed -e 's/["]//g' | cut -f2 -d=` +XPI_NAME="$APP_NAME-`grep em:version src/install.rdf | sed -e 's/[<>]/ /g' | cut -f3`.xpi"
if [ -e "pkg/$XPI_NAME" ]; then echo pkg/$XPI_NAME already exists. diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js index 7d1effd..6f69d85 100644 --- a/src/chrome/content/torbutton_util.js +++ b/src/chrome/content/torbutton_util.js @@ -252,7 +252,7 @@ function torbutton_about_init() { try { // Firefox 4 and later; Mozilla 2 and later Components.utils.import("resource://gre/modules/AddonManager.jsm"); - AddonManager.getAddonByID("{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}",function(addon) { + AddonManager.getAddonByID("torbutton@torproject.org",function(addon) { var extensionVersion = document.getElementById("torbuttonVersion"); extensionVersion.setAttribute("value", addon.version); }); @@ -260,7 +260,7 @@ function torbutton_about_init() { // Firefox 3.6 and before; Mozilla 1.9.2 and before var em = Components.classes["@mozilla.org/extensions/manager;1"] .getService(Components.interfaces.nsIExtensionManager); - var addon = em.getItemForID("{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}"); + var addon = em.getItemForID("torbutton@torproject.org"); var extensionVersion = document.getElementById("torbuttonVersion"); extensionVersion.setAttribute("value", addon.version); } diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 875240e..f4a8036 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins torbutton.panel.plugins.enabled = Click to disable plugins torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled -extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy +extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index a0a26d8..b03dd71 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo // Display prefs pref("extensions.torbutton.display_panel",true); pref("extensions.torbutton.panel_style",'text'); -pref("extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description", "chrome://torbutton/locale/torbutton.properties"); +pref("extensions.torbutton@torproject.org.description", "chrome://torbutton/locale/torbutton.properties");
// proxy prefs pref("extensions.torbutton.settings_method",'recommended'); @@ -172,8 +172,7 @@ pref("extensions.torbutton.update_torbutton_via_tor",true); pref("extensions.torbutton.tor_urls",false); // Opt out of Firefox addon pings: // https://developer.mozilla.org/en/Addons/Working_with_AMO -pref("extensions.e0204bd5-9d31-402b-a99d-a6aa8ffebdca.getAddons.cache.enabled", false); -pref("extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.getAddons.cache.enabled", false); +pref("extensions.torbutton@torproject.org.getAddons.cache.enabled", false);
// Google Captcha prefs diff --git a/src/install.rdf b/src/install.rdf index 6eff883..e413c44 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -1,21 +1,24 @@ <?xml version="1.0"?> -<RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#" - xmlns:NC="http://home.netscape.com/NC-rdf#" - xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#%22%3E - <RDF:Description RDF:about="rdf:#$jIW5u3" - em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" - em:minVersion="3.0" - em:maxVersion="10000.0" /> - <RDF:Description RDF:about="urn:mozilla:install-manifest" - em:name="Torbutton" - em:creator="Mike Perry" - em:id="{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}" - em:version="1.5.0pre" - em:homepageURL="https://www.torproject.org/torbutton/" - em:optionsURL="chrome://torbutton/content/preferences.xul" - em:iconURL="chrome://torbutton/skin/tor.png" - em:updateURL="https://www.torproject.org/torbutton/update.rdf" - em:updateKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1T8SmtWvdBibisbQdmNxSP9sCyoc5rPoTFfntg3uXo6KpCtTzCPSc5a3MCHJIUBuPDfr73IIQvb6cyPG4MB6xe+oVGiffW3Fm4R1u6UX4TtEG/GF5QGxfVTrbyxbGeR5fOm9O8TNZFwUNA/cu3gDtcJz2xGkE44IwYPfITLHBrQIDAQAB"> - <em:targetApplication RDF:resource="rdf:#$jIW5u3"/> - </RDF:Description> -</RDF:RDF> +<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:em="http://www.mozilla.org/2004/em-rdf#%22%3E + + <Description about="urn:mozilla:install-manifest"> + em:nameTorbutton</em:name> + em:creatorMike Perry</em:creator> + em:idtorbutton@torproject.org</em:id> + em:version1.5.0-alpha</em:version> + em:homepageURLhttps://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> + em:optionsURLchrome://torbutton/content/preferences.xul</em:optionsURL> + em:iconURLchrome://torbutton/skin/tor.png</em:iconURL> + em:updateURLhttps://www.torproject.org/torbutton/update17esr.rdf</em:updateURL> + <!-- <em:updateKey></em:updateKey> --> + <!-- firefox --> + em:targetApplication + <Description> + em:id{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> + em:minVersion17.0</em:minVersion> + em:maxVersion10000.0</em:maxVersion> + </Description> + </em:targetApplication> + </Description> +</RDF>