Fix Reload/ Stop menu items.

The menu items were sensitive in reversed logic and the Stop item
had the icon and accelerator of the Reload item.

Now the sensitivity is fixed and the Stop item is Stop again.

diff --git a/src/midori-browser.c b/src/midori-browser.c
index 245e2d87b8d6c8384bb34d72cf0b8879da713bd4..9395a531c2e51b37f99d22095ddbeb46ef640b6a 100644 (file)
--- a/src/midori-browser.c
+++ b/src/midori-browser.c
@@ -174,8 +174,8 @@ _midori_browser_update_interface (MidoriBrowser* browser)
         webkit_web_view_can_go_back (WEBKIT_WEB_VIEW (web_view)));
     _action_set_sensitive (browser, "Forward",
         webkit_web_view_can_go_forward (WEBKIT_WEB_VIEW (web_view)));
-    _action_set_sensitive (browser, "Reload", loading);
-    _action_set_sensitive (browser, "Stop", !loading);
+    _action_set_sensitive (browser, "Reload", !loading);
+    _action_set_sensitive (browser, "Stop", loading);
 
     GtkAction* action = gtk_action_group_get_action (priv->action_group,
                                                      "ReloadStop");
@@ -1930,8 +1930,8 @@ static const GtkActionEntry entries[] = {
  { "Reload", GTK_STOCK_REFRESH,
    NULL, "<Ctrl>r",
    N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
- { "Stop", GTK_STOCK_REFRESH,
-   NULL, "<Ctrl>r",
+ { "Stop", GTK_STOCK_STOP,
+   NULL, "Escape",
    N_("Stop loading the current page"), G_CALLBACK (_action_reload_stop_activate) },
  { "ReloadStop", GTK_STOCK_STOP,
    NULL, "<Ctrl>r",