From: Christian Dywan <christian@twotoasts.de>
Date: Thu, 3 Apr 2008 21:33:32 +0000 (+0200)
Subject: Fix Reload/ Stop menu items.
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=793b030d3a7781f3ad7f45312e0257105f68fb54;p=midori

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 245e2d87..9395a531 100644
--- 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",