Allow reloading regardless of whether a load is already in progress

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 8c7d41fa085669d5407a74f86d76eafe6cdde68b..8e2b5dfda20204bb9a12da049ee00fad7d8a46d8 100644 (file)
--- 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 265b41885bea7df33ffaa9d8854061c07bbc9d97..11cc85af1813d590a7a639197b62b39dd37f1c45 100644 (file)
--- 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,