From 52420ef8d4b9ba8f571a1da709980000568edbf1 Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Wed, 02 Nov 2011 12:05:16 +0000
Subject: Restore reload, stop loading functionality

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
---
diff --git a/webtoolbar.py b/webtoolbar.py
index 0e4183b..db45cb1 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -343,7 +343,7 @@ class PrimaryToolbar(ToolbarBase):
         status = widget.get_load_status()
         if status <= WebKit.LoadStatus.COMMITTED:
             self._set_title(None)
-        self._set_loading(status >= WebKit.LoadStatus.FINISHED)
+        self._set_loading(status < WebKit.LoadStatus.FINISHED)
         self._update_navigation_buttons()
 
     def _progress_changed_cb(self, widget, param):
@@ -400,10 +400,9 @@ class PrimaryToolbar(ToolbarBase):
     def _stop_and_reload_cb(self, entry, icon_pos, button):
         browser = self._tabbed_view.props.current_browser
         if self._loading:
-            browser.web_navigation.stop(interfaces.nsIWebNavigation.STOP_ALL)
+            browser.stop_loading()
         else:
-            flags = interfaces.nsIWebNavigation.LOAD_FLAGS_NONE
-            browser.web_navigation.reload(flags)
+            browser.reload()
 
     def _set_loading(self, loading):
         self._loading = loading
--
cgit v0.9.1