From 4b765436d0815dd58924f92fbd421ec9ec16f1ce Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Mon, 21 May 2007 20:56:48 +0000
Subject: More navigation fixes

---
diff --git a/webtoolbar.py b/webtoolbar.py
index 6fa57c4..49bf3b7 100755
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -42,10 +42,10 @@ class _ProgressListener:
         
     def onStateChange(self, webProgress, request, stateFlags, status):
         if stateFlags & interfaces.nsIWebProgressListener.STATE_START:
-            self._toolbar._show_reload_icon()
+            self._toolbar._show_stop_icon()
             self._toolbar._update_navigation_buttons()
         if stateFlags & interfaces.nsIWebProgressListener.STATE_STOP:
-            self._toolbar._show_stop_icon()
+            self._toolbar._show_reload_icon()
             self._toolbar._update_navigation_buttons()            
 
     def onStatusChange(self, webProgress, request, status, message):
@@ -107,8 +107,7 @@ class WebToolbar(gtk.Toolbar):
         self._forward.props.sensitive = can_go_forward
 
     def _entry_activate_cb(self, entry):
-        self._embed.load_uri(entry.props.text)
-        self._embed.grab_focus()
+        self._browser.load_uri(entry.props.text)
 
     def _go_back_cb(self, button):
         self._browser.web_navigation.goBack()
@@ -118,6 +117,7 @@ class WebToolbar(gtk.Toolbar):
 
     def _stop_and_reload_cb(self, button):
         if self._embed.props.loading:
-            self._embed.stop_load()
+            self._browser.web_navigation.stop()
         else:
-            self._embed.reload(0)
+            flags = interfaces.nsIWebNavigation.LOAD_FLAGS_NONE
+            self._browser.web_navigation.reload(flags)
--
cgit v0.9.1