From 7bd6302d1325347d3e32fdb57ffd56664233bfae Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 16 May 2014 07:11:39 +0200
Subject: [PATCH] Connect load_status_changed signal correctly

---
 qutebrowser/app.py                    | 1 +
 qutebrowser/widgets/_tabbedbrowser.py | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index b6c0282db..5c670e217 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -410,6 +410,7 @@ class QuteBrowser(QApplication):
         tabs.currentChanged.connect(status.url.on_tab_changed)
         tabs.cur_url_text_changed.connect(status.url.set_url)
         tabs.cur_link_hovered.connect(status.url.set_hover_url)
+        tabs.cur_load_status_changed.connect(status.url.on_load_status_changed)
 
         # command input / completion
         self.modeman.left.connect(tabs.on_mode_left)
diff --git a/qutebrowser/widgets/_tabbedbrowser.py b/qutebrowser/widgets/_tabbedbrowser.py
index 6ea720083..590fdda6f 100644
--- a/qutebrowser/widgets/_tabbedbrowser.py
+++ b/qutebrowser/widgets/_tabbedbrowser.py
@@ -67,6 +67,7 @@ class TabbedBrowser(TabWidget):
         cur_scroll_perc_changed: Scroll percentage of current tab changed.
                                  arg 1: x-position in %.
                                  arg 2: y-position in %.
+        cur_load_status_changed: Loading status of current tab changed.
         hint_strings_updated: Hint strings were updated.
                               arg: A list of hint strings.
         shutdown_complete: The shuttdown is completed.
@@ -83,6 +84,7 @@ class TabbedBrowser(TabWidget):
     cur_url_text_changed = pyqtSignal(str)
     cur_link_hovered = pyqtSignal(str, str, str)
     cur_scroll_perc_changed = pyqtSignal(int, int)
+    cur_load_status_changed = pyqtSignal(str)
     hint_strings_updated = pyqtSignal(list)
     shutdown_complete = pyqtSignal()
     quit = pyqtSignal()
@@ -137,8 +139,6 @@ class TabbedBrowser(TabWidget):
         tab.linkHovered.connect(self._filter.create(self.cur_link_hovered))
         tab.loadProgress.connect(self._filter.create(self.cur_progress))
         tab.loadFinished.connect(self._filter.create(self.cur_load_finished))
-        tab.page().mainFrame().loadStarted.connect(partial(
-            self.on_load_started, tab))
         tab.loadStarted.connect(self._filter.create(self.cur_load_started))
         tab.statusBarMessage.connect(
             self._filter.create(self.cur_statusbar_message))
@@ -147,12 +147,16 @@ class TabbedBrowser(TabWidget):
         tab.url_text_changed.connect(
             self._filter.create(self.cur_url_text_changed))
         tab.url_text_changed.connect(self.on_url_text_changed)
+        tab.load_status_changed.connect(
+            self._filter.create(self.cur_load_status_changed))
         # hintmanager
         tab.hintmanager.hint_strings_updated.connect(self.hint_strings_updated)
         tab.hintmanager.openurl.connect(self.cur.openurl_slot)
         # misc
         tab.titleChanged.connect(self.on_title_changed)
         tab.iconChanged.connect(self.on_icon_changed)
+        tab.page().mainFrame().loadStarted.connect(partial(
+            self.on_load_started, tab))
 
     def _close_tab(self, tab_or_idx):
         """Close a tab with either index or tab given.