Allow reloading regardless of whether a load is already in progress

This commit is contained in:
Christian Dywan 2009-11-18 19:36:37 +01:00
parent 5b8438bee3
commit 83f07d7de9
2 changed files with 2 additions and 4 deletions

View file

@ -282,7 +282,7 @@ _midori_browser_update_interface (MidoriBrowser* browser)
loading = midori_view_get_load_status (view) != MIDORI_LOAD_FINISHED; loading = midori_view_get_load_status (view) != MIDORI_LOAD_FINISHED;
can_reload = midori_view_can_reload (view); 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, "Stop", can_reload && loading);
_action_set_sensitive (browser, "Back", midori_view_can_go_back (view)); _action_set_sensitive (browser, "Back", midori_view_can_go_back (view));
_action_set_sensitive (browser, "Forward", midori_view_can_go_forward (view)); _action_set_sensitive (browser, "Forward", midori_view_can_go_forward (view));
@ -5110,8 +5110,8 @@ static const gchar* ui_markup =
"</menu>" "</menu>"
"<menuitem action='Panel'/>" "<menuitem action='Panel'/>"
"<separator/>" "<separator/>"
"<menuitem action='Reload'/>"
"<menuitem action='Stop'/>" "<menuitem action='Stop'/>"
"<menuitem action='Reload'/>"
"<separator/>" "<separator/>"
"<menuitem action='ZoomIn'/>" "<menuitem action='ZoomIn'/>"
"<menuitem action='ZoomOut'/>" "<menuitem action='ZoomOut'/>"

View file

@ -3769,8 +3769,6 @@ can_do (find)
* @from_cache: whether to allow caching * @from_cache: whether to allow caching
* *
* Reloads the view. * Reloads the view.
*
* Note: The @from_cache value is currently ignored.
**/ **/
void void
midori_view_reload (MidoriView* view, midori_view_reload (MidoriView* view,