[Xfce4-commits] <midori:master> Use distinct labels for Refresh actions in shortcut editor

[Christian Dywan]

Updating branch refs/heads/master
         to 912637025cbf19455927eb3d27629e7fbca5dd2c (commit)
       from 4557f086ef9fff730a760a852f62afd4e769303b (commit)

commit 912637025cbf19455927eb3d27629e7fbca5dd2c
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Feb 20 04:13:30 2011 +0100

    Use distinct labels for Refresh actions in shortcut editor

 extensions/shortcuts.c  |    8 +++++++-
 midori/midori-browser.c |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c
index 12671fa..a9cd165 100644
--- a/extensions/shortcuts.c
+++ b/extensions/shortcuts.c
@@ -100,10 +100,16 @@ shortcuts_accel_cleared_cb (GtkCellRenderer* renderer,
 static gchar*
 shortcuts_label_for_action (GtkAction* action)
 {
+    const gchar* name = gtk_action_get_name (action);
     gchar* label;
     gchar* stripped;
 
-    if ((label = katze_object_get_string (action, "label")))
+    if (g_str_equal (name, "ReloadStop"))
+    {
+        label = NULL;
+        stripped = g_strdup (_("Reload page or stop loading"));
+    }
+    else if ((label = katze_object_get_string (action, "label")))
         stripped = katze_strip_mnemonics (label);
     else
     {
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 0974f9c..d75faa0 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4892,7 +4892,7 @@ static const GtkActionEntry entries[] =
         NULL, "<Ctrl>r",
         N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
     { "ReloadUncached", GTK_STOCK_REFRESH,
-        NULL, "<Ctrl><Shift>r",
+        N_("Reload page without caching"), "<Ctrl><Shift>r",
         N_("Reload page without caching"), G_CALLBACK (_action_reload_stop_activate) },
     { "Stop", GTK_STOCK_STOP,
         NULL, "Escape",