Commit 30c900dd authored by Mike Perry's avatar Mike Perry
Browse files

Switch our addon ID to something human readable.

parent ef2de3d6
#!/bin/bash #!/bin/sh
APP_NAME=torbutton APP_NAME=torbutton
VERSION=`grep em:version src/install.rdf | sed -e 's/["]//g' | cut -f2 -d=` #VERSION=`grep em:version src/install.rdf | sed -e 's/["]//g' | cut -f2 -d=`
XPI_NAME=$APP_NAME-$VERSION.xpi XPI_NAME="$APP_NAME-`grep em:version src/install.rdf | sed -e 's/[<>]/ /g' | cut -f3`.xpi"
if [ -e "pkg/$XPI_NAME" ]; then if [ -e "pkg/$XPI_NAME" ]; then
echo pkg/$XPI_NAME already exists. echo pkg/$XPI_NAME already exists.
......
...@@ -252,7 +252,7 @@ function torbutton_about_init() { ...@@ -252,7 +252,7 @@ function torbutton_about_init() {
try { try {
// Firefox 4 and later; Mozilla 2 and later // Firefox 4 and later; Mozilla 2 and later
Components.utils.import("resource://gre/modules/AddonManager.jsm"); 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"); var extensionVersion = document.getElementById("torbuttonVersion");
extensionVersion.setAttribute("value", addon.version); extensionVersion.setAttribute("value", addon.version);
}); });
...@@ -260,7 +260,7 @@ function torbutton_about_init() { ...@@ -260,7 +260,7 @@ function torbutton_about_init() {
// Firefox 3.6 and before; Mozilla 1.9.2 and before // Firefox 3.6 and before; Mozilla 1.9.2 and before
var em = Components.classes["@mozilla.org/extensions/manager;1"] var em = Components.classes["@mozilla.org/extensions/manager;1"]
.getService(Components.interfaces.nsIExtensionManager); .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"); var extensionVersion = document.getElementById("torbuttonVersion");
extensionVersion.setAttribute("value", addon.version); extensionVersion.setAttribute("value", addon.version);
} }
......
...@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins ...@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
torbutton.panel.plugins.enabled = Click to disable plugins torbutton.panel.plugins.enabled = Click to disable plugins
torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled 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.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.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) 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)
......
...@@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo ...@@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo
// Display prefs // Display prefs
pref("extensions.torbutton.display_panel",true); pref("extensions.torbutton.display_panel",true);
pref("extensions.torbutton.panel_style",'text'); 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 // proxy prefs
pref("extensions.torbutton.settings_method",'recommended'); pref("extensions.torbutton.settings_method",'recommended');
...@@ -172,8 +172,7 @@ pref("extensions.torbutton.update_torbutton_via_tor",true); ...@@ -172,8 +172,7 @@ pref("extensions.torbutton.update_torbutton_via_tor",true);
pref("extensions.torbutton.tor_urls",false); pref("extensions.torbutton.tor_urls",false);
// Opt out of Firefox addon pings: // Opt out of Firefox addon pings:
// https://developer.mozilla.org/en/Addons/Working_with_AMO // https://developer.mozilla.org/en/Addons/Working_with_AMO
pref("extensions.e0204bd5-9d31-402b-a99d-a6aa8ffebdca.getAddons.cache.enabled", false); pref("extensions.torbutton@torproject.org.getAddons.cache.enabled", false);
pref("extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.getAddons.cache.enabled", false);
// Google Captcha prefs // Google Captcha prefs
......
<?xml version="1.0"?> <?xml version="1.0"?>
<RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#" <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:NC="http://home.netscape.com/NC-rdf#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<RDF:Description RDF:about="rdf:#$jIW5u3" <Description about="urn:mozilla:install-manifest">
em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" <em:name>Torbutton</em:name>
em:minVersion="3.0" <em:creator>Mike Perry</em:creator>
em:maxVersion="10000.0" /> <em:id>torbutton@torproject.org</em:id>
<RDF:Description RDF:about="urn:mozilla:install-manifest" <em:version>1.5.0-alpha</em:version>
em:name="Torbutton" <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL>
em:creator="Mike Perry" <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>
em:id="{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}" <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>
em:version="1.5.0pre" <em:updateURL>https://www.torproject.org/torbutton/update17esr.rdf</em:updateURL>
em:homepageURL="https://www.torproject.org/torbutton/" <!-- <em:updateKey></em:updateKey> -->
em:optionsURL="chrome://torbutton/content/preferences.xul" <!-- firefox -->
em:iconURL="chrome://torbutton/skin/tor.png" <em:targetApplication>
em:updateURL="https://www.torproject.org/torbutton/update.rdf" <Description>
em:updateKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1T8SmtWvdBibisbQdmNxSP9sCyoc5rPoTFfntg3uXo6KpCtTzCPSc5a3MCHJIUBuPDfr73IIQvb6cyPG4MB6xe+oVGiffW3Fm4R1u6UX4TtEG/GF5QGxfVTrbyxbGeR5fOm9O8TNZFwUNA/cu3gDtcJz2xGkE44IwYPfITLHBrQIDAQAB"> <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:targetApplication RDF:resource="rdf:#$jIW5u3"/> <em:minVersion>17.0</em:minVersion>
</RDF:Description> <em:maxVersion>10000.0</em:maxVersion>
</RDF:RDF> </Description>
</em:targetApplication>
</Description>
</RDF>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment