[or-cvs] r12583: Fix user agent pref change issue spotted by phobos. Also rem (in torbutton/trunk/src: . chrome/content)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2007-11-28 01:45:39 -0500 (Wed, 28 Nov 2007)
New Revision: 12583

Modified:
   torbutton/trunk/src/chrome/content/torbutton.js
   torbutton/trunk/src/install.rdf
Log:

Fix user agent pref change issue spotted by phobos. Also
remove the original window observers when the original window
is closed (fixes a potential memory leak).



Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2007-11-28 03:40:27 UTC (rev 12582)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2007-11-28 06:45:39 UTC (rev 12583)
@@ -107,17 +107,39 @@
                 torbutton_crash_recover();
                 break;
 
+            case "extensions.torbutton.set_uagent":
+                // If the user turns off the pref, reset their user agent to
+                // vanilla
+                if(!m_tb_prefs.getBoolPref("extensions.torbutton.set_uagent")) {
+                    if(m_tb_prefs.prefHasUserValue("general.appname.override"))
+                        m_tb_prefs.clearUserPref("general.appname.override");
+                    if(m_tb_prefs.prefHasUserValue("general.appversion.override"))
+                        m_tb_prefs.clearUserPref("general.appversion.override");
+                    if(m_tb_prefs.prefHasUserValue("general.useragent.override"))
+                        m_tb_prefs.clearUserPref("general.useragent.override");
+                    if(m_tb_prefs.prefHasUserValue("general.useragent.vendor"))
+                        m_tb_prefs.clearUserPref("general.useragent.vendor");
+                    if(m_tb_prefs.prefHasUserValue("general.useragent.vendorSub"))
+                        m_tb_prefs.clearUserPref("general.useragent.vendorSub");
+                    if(m_tb_prefs.prefHasUserValue("general.platform.override"))
+                        m_tb_prefs.clearUserPref("general.platform.override");
+                } else {
+                    torbutton_log(1, "Got update message, updating status");
+                    torbutton_update_status(
+                            m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"),
+                            true);
+                }
+                break;
+
             case "extensions.torbutton.disable_referer":
                 if(!m_tb_prefs.getBoolPref("extensions.torbutton.disable_referer")) {
                     m_tb_prefs.setBoolPref("network.http.sendSecureXSiteReferrer", true);
                     m_tb_prefs.setIntPref("network.http.sendRefererHeader", 2);
                 }
-
             case "extensions.torbutton.no_tor_plugins":
             case "extensions.torbutton.no_updates":
             case "extensions.torbutton.no_search":
             case "extensions.torbutton.block_cache":
-            case "extensions.torbutton.set_uagent":
             case "extensions.torbutton.block_nthwrite":
             case "extensions.torbutton.block_thwrite":
             case "extensions.torbutton.shutdown_method":
@@ -489,7 +511,7 @@
     if(!changed && !force_update) return;
 
     torbutton_log(2, 'Setting user agent');
-    // XXX: this needs an else block...
+    
     if(torprefs.getBoolPref("set_uagent")) {
         if(mode) {
             try {
@@ -1078,9 +1100,19 @@
             if(win != window) {
                 torbutton_log(3, "Found another window");
                 win.torbutton_do_main_window_startup();
+                m_tb_is_main_window = false;
                 break;
             }
         }
+
+        // remove old listeners
+        var progress = Components.classes["@mozilla.org/docloaderservice;1"].
+            getService(Components.interfaces.nsIWebProgress);
+
+        progress.removeProgressListener(torbutton_weblistener);
+        torbutton_unique_pref_observer.unregister();
+        torbutton_uninstall_observer.unregister();
+
     }
 }
 

Modified: torbutton/trunk/src/install.rdf
===================================================================
--- torbutton/trunk/src/install.rdf	2007-11-28 03:40:27 UTC (rev 12582)
+++ torbutton/trunk/src/install.rdf	2007-11-28 06:45:39 UTC (rev 12583)
@@ -6,7 +6,7 @@
         <em:name>Torbutton</em:name>
         <em:creator>Scott Squires &amp; Mike Perry</em:creator>
         <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id>
-        <em:version>1.1.12-alpha</em:version>
+        <em:version>1.1.12-alpha-dev</em:version>
         <em:homepageURL>https://torbutton.torproject.org/dev/</em:homepageURL>
         <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>
         <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>