[or-cvs] r14846: Update changelog. Also change http observer slightly for fav (in torbutton/trunk/src: . chrome/content)

[mikeperry at seul.org]

Author: mikeperry
Date: 2008-05-30 16:33:57 -0400 (Fri, 30 May 2008)
New Revision: 14846

Modified:
   torbutton/trunk/src/CHANGELOG
   torbutton/trunk/src/chrome/content/torbutton.js
Log:

Update changelog. Also change http observer slightly for
favicon blocking under FF3.



Modified: torbutton/trunk/src/CHANGELOG
===================================================================
--- torbutton/trunk/src/CHANGELOG	2008-05-30 18:01:46 UTC (rev 14845)
+++ torbutton/trunk/src/CHANGELOG	2008-05-30 20:33:57 UTC (rev 14846)
@@ -1,3 +1,24 @@
+1.2.0rc1
+  30 May 2008
+  * general: FF3 should now be functional, but timezone masking is not
+    operational
+  * bugfix: Fix Places/history component hooking in FF3
+  * bugfix: Disable Places database in FF3 via browser.history_expire_days=0
+    during Tor usage if history writes are disabled.
+  * bugfix: General component hooking fixes for FF3
+  * bugfix: Block favicon leaking in FF3
+  * bugfix: Enable safebrowsing updates in FF3 (it's finally HMACd. Yay).
+  * bugfix: Properly reset cookie lifetime policy when user changes cookie
+    handling options.
+  * bugfix: Fix 'Restore defaults' button issues with custom proxy settings
+  * bugfix: navigator.oscpu hooking was broken in 1.1.18
+  * bugfix: Try to prevent alleged 0x0 windows on crash recovery
+  * bugfix: Attempt to block livemarks updates during Tor. Only partial fix.
+    Not possible to cancel existing Livemarks timer (one fetch will still
+    happen via Tor before disable). See Firefox Bug 436250
+  * misc: Set plugin.disable_full_page_plugin_for_types for all plugin
+    mimetypes just in case our custom full page blocking code fails
+
 1.1.18
   17 Apr 2008
   * bugfix: Fix Gmail exceptions involving window.navigator that made Gmail

Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2008-05-30 18:01:46 UTC (rev 14845)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2008-05-30 20:33:57 UTC (rev 14846)
@@ -795,9 +795,8 @@
         return;
 
     if(mode) {
-        // Disable livemark fetching on FF3
-        // XXX: save user pref
-        m_tb_prefs.setIntPref("browser.bookmarks.livemark_refresh_seconds", 0);
+        // XXX: This doesn't really do what we want.. 
+        m_tb_prefs.setIntPref("browser.bookmarks.livemark_refresh_seconds", 31536000);
     } else {
         if(m_tb_prefs.prefHasUserValue("browser.bookmarks.livemark_refresh_seconds")) {
             m_tb_prefs.clearUserPref("browser.bookmarks.livemark_refresh_seconds");
@@ -1708,8 +1707,8 @@
 var torbutton_http_observer = {
 observe : function(subject, topic, data) {
   torbutton_eclog(2, 'Examine response: '+subject.name);
-  if (!((subject instanceof Components.interfaces.nsIHttpChannel)
-      && (subject.loadFlags & Components.interfaces.nsIChannel.LOAD_DOCUMENT_URI))) {
+  if (((subject instanceof Components.interfaces.nsIHttpChannel)
+      && !(subject.loadFlags & Components.interfaces.nsIChannel.LOAD_DOCUMENT_URI))) {
       // FIXME: FF3 no longer calls the contet policy for favicons. 
       // This is the workaround. Fun fun fun.
       if(m_tb_ff3) {
@@ -1736,6 +1735,10 @@
       }
       return;
   }
+  if(!(subject instanceof Components.interfaces.nsIHttpChannel)) {
+      torbutton_eclog(2, 'Non-http request '+subject.name);
+  }
+
   if (topic == "http-on-examine-response") {
       torbutton_eclog(3, 'Definitaly Examine response: '+subject.name);
       torbutton_check_progress(null, subject);