[Pkg-mozext-commits] [SCM] torbutton Debian packaging branch, master, updated. debian/1.4.3-1

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 5ff3ed50fab4ac1a48c6ee5b23e64e293ecd3e32
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue Sep 13 23:00:52 2011 +0200

    Refresh fix-loading-of-system-homepage.patch

diff --git a/debian/patches/fix-loading-of-system-homepage.patch b/debian/patches/fix-loading-of-system-homepage.patch
index a2f5fa7..8c61d10 100644
--- a/debian/patches/fix-loading-of-system-homepage.patch
+++ b/debian/patches/fix-loading-of-system-homepage.patch
@@ -7,10 +7,9 @@ Forwarded: https://trac.torproject.org/projects/tor/ticket/3686
  1 files changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
-index 06004e5..eac8ad4 100644
 --- a/src/chrome/content/torbutton.js
 +++ b/src/chrome/content/torbutton.js
-@@ -2449,6 +2449,21 @@ function torbutton_tag_new_browser(browser, tor_tag, no_plugins) {
+@@ -2798,6 +2796,21 @@ function torbutton_tag_new_browser(browser, tor_tag, no_plugins) {
      }
  }
  
@@ -32,17 +31,17 @@ index 06004e5..eac8ad4 100644
  function torbutton_set_launch_state(state, session_restore) {
      if (!m_tb_wasinited) torbutton_init();
      var no_plugins = m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins");
-@@ -2508,8 +2523,7 @@ function torbutton_set_launch_state(state, session_restore) {
- 
-         // Load our homepage again. We just killed it via the toggle.
-         if (!session_restore) {
+@@ -2873,8 +2886,7 @@ function torbutton_set_launch_state(state, session_restore) {
+               }
+             }
+           }
 -          var homepage = m_tb_prefs.getCharPref("browser.startup.homepage");
 -          gBrowser.loadURI(homepage, null, null);
-+            torbutton_reload_homepage();
++          torbutton_reload_homepage();
          }
        } else {
          torbutton_log(3, "Leaving tor disabled");
-@@ -2522,8 +2536,7 @@ function torbutton_set_launch_state(state, session_restore) {
+@@ -2887,8 +2899,7 @@ function torbutton_set_launch_state(state, session_restore) {
  
          // Load our homepage again. We just killed it via the toggle.
          if (!session_restore) {
@@ -52,6 +51,3 @@ index 06004e5..eac8ad4 100644
          }
      }
  }
--- 
-1.7.2.5
-

-- 
torbutton Debian packaging