[Xfce4-commits] <midori:master> Allow reloading regardless of whether a load is already in progress

[Christian Dywan]

Updating branch refs/heads/master
         to 83f07d7de9643345a6526c3a35c12284610060b1 (commit)
       from 5b8438bee3ff9b5be6f089af4ca702f0d0b38160 (commit)

commit 83f07d7de9643345a6526c3a35c12284610060b1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Nov 18 19:36:37 2009 +0100

    Allow reloading regardless of whether a load is already in progress

 midori/midori-browser.c |    4 ++--
 midori/midori-view.c    |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 8c7d41f..8e2b5df 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -282,7 +282,7 @@ _midori_browser_update_interface (MidoriBrowser* browser)
     loading = midori_view_get_load_status (view) != MIDORI_LOAD_FINISHED;
     can_reload = midori_view_can_reload (view);
 
-    _action_set_sensitive (browser, "Reload", can_reload && !loading);
+    _action_set_sensitive (browser, "Reload", can_reload);
     _action_set_sensitive (browser, "Stop", can_reload && loading);
     _action_set_sensitive (browser, "Back", midori_view_can_go_back (view));
     _action_set_sensitive (browser, "Forward", midori_view_can_go_forward (view));
@@ -5110,8 +5110,8 @@ static const gchar* ui_markup =
     "</menu>"
     "<menuitem action='Panel'/>"
     "<separator/>"
-    "<menuitem action='Reload'/>"
     "<menuitem action='Stop'/>"
+    "<menuitem action='Reload'/>"
     "<separator/>"
     "<menuitem action='ZoomIn'/>"
     "<menuitem action='ZoomOut'/>"
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 265b418..11cc85a 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3769,8 +3769,6 @@ can_do (find)
  * @from_cache: whether to allow caching
  *
  * Reloads the view.
- *
- * Note: The @from_cache value is currently ignored.
  **/
 void
 midori_view_reload (MidoriView* view,