From b16429bbe216e7b85c9d8f53c350ad57f9f7becc Mon Sep 17 00:00:00 2001
From: Lucian Branescu Mihaila <lucian.branescu@gmail.com>
Date: Tue, 13 Jul 2010 17:08:03 +0000
Subject: Sort out some argument issues. Fixes load progress and URI showing on mouse hover.

---
diff --git a/webtoolbar.py b/webtoolbar.py
index c90fb81..8987263 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -294,7 +294,6 @@ class PrimaryToolbar(ToolbarBox):
         self._connect_to_browser(tabbed_view.props.current_browser)
 
     def _connect_to_browser(self, browser):
-        logging.warning('Connecting to browser...')
         if self._browser is not None:
             self._browser.disconnect(self._location_changed_hid)
             self._browser.disconnect(self._loading_changed_hid)
@@ -322,10 +321,8 @@ class PrimaryToolbar(ToolbarBox):
         self._set_loading(False)
         self._update_navigation_buttons()
 
-        logging.warning('Connected to browser.')
-
-    def __location_changed_cb(self, frame):
-        self._set_address(frame.get_uri())
+    def __location_changed_cb(self, browser, user_data):
+        self._set_address(browser.props.uri)
         self._update_navigation_buttons()
         filepicker.cleanup_temp_files()
 
@@ -336,7 +333,7 @@ class PrimaryToolbar(ToolbarBox):
         self._set_loading(False)
         self._update_navigation_buttons()
 
-    def __progress_changed_cb(self, progress, user_data):
+    def __progress_changed_cb(self, browser, progress):
         self._set_progress(progress)
 
     def _title_changed_cb(self, browser, frame, user_data):
--
cgit v0.9.1