fixed callback definitions and progress indicator

* webkit reports progress between 0-100, and sugar's
  AddressEntry likes it between 0-1

1 files changed, 6 insertions, 5 deletions

diff --git a/webtoolbar.py b/webtoolbar.py
index df97bdf..6710bbb 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -58,7 +58,7 @@ class WebEntry(AddressEntry):
            recognize changes caused directly by user actions"""
         self.handler_block(self._change_hid)
         try:
-            self.props.text = text            
+            if text: self.props.text = text
         finally:
             self.handler_unblock(self._change_hid)
         self.set_position(-1)
@@ -273,7 +273,7 @@ class WebToolbar(gtk.Toolbar):
         # We have to wait until the history info is updated.
         gobject.idle_add(self._reload_session_history, current_page_index)
 
-    def _loading_start_cb(self, progress_listener):
+    def _loading_start_cb(self, view, frame):
         self._set_title(None)
         self._set_loading(True)
         self._update_navigation_buttons()
@@ -285,13 +285,14 @@ class WebToolbar(gtk.Toolbar):
         self._set_address(ui_uri)
         self._set_title(ui_title)
         self._update_navigation_buttons()
-        filepicker.cleanup_temp_files()
 
     def _loading_progress_cb(self, view, progress):
         self._set_progress(progress)
 
     def _set_progress(self, progress):
-        self.entry.props.progress = progress
+        # WebKit returns the progress between 0-100 but
+        # sugar.AddressEntry expects 0-1
+        self.entry.props.progress = progress/100.0
 
     def _set_address(self, address):
         self.entry.props.address = address
@@ -322,7 +323,7 @@ class WebToolbar(gtk.Toolbar):
     def _go_forward_cb(self, button):
         self._browser.go_forward()
 
-    def _title_changed_cb(self, view, new_title):
+    def _title_changed_cb(self, view, frame, new_title):
         self._set_title(new_title)
 
     def _stop_and_reload_cb(self, button):