[Xfce4-commits] <xfce4-weather-plugin:master> Context menu: Resolve mnemonic conflict for Refresh and Remove (bug #9911).

[Harald Judt]

Updating branch refs/heads/master
         to 4e911b63099a3dcf26d5fe49ba0397e90b62e1d6 (commit)
       from 72fdfaec8c9b4c65af6ec9123d7ef910df755f99 (commit)

commit 4e911b63099a3dcf26d5fe49ba0397e90b62e1d6
Author: Harald Judt <h.judt at gmx.at>
Date:   Thu Mar 21 15:29:10 2013 +0100

    Context menu: Resolve mnemonic conflict for Refresh and Remove (bug #9911).
    
    Stock menu items share mnemonics, so we need to build our own Refresh menu
    item. Use "Re_fresh" and keep "_Remove" for consistency with other plugins.
    Translators will have to care about "Re_fresh" now.

 panel-plugin/weather.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 1c8f438..a4429c9 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -1726,9 +1726,9 @@ xfceweather_create_control(XfcePanelPlugin *plugin)
     plugin_data *data = g_slice_new0(plugin_data);
     SoupURI *soup_proxy_uri;
     const gchar *proxy_uri;
-    GtkWidget *refresh;
-    data_types lbl;
+    GtkWidget *refresh, *refresh_icon;
     GdkPixbuf *icon = NULL;
+    data_types lbl;
 
     /* Initialize with sane default values */
     data->plugin = plugin;
@@ -1822,7 +1822,10 @@ xfceweather_create_control(XfcePanelPlugin *plugin)
 
     /* add refresh button to right click menu, for people who missed
        the middle mouse click feature */
-    refresh = gtk_image_menu_item_new_from_stock("gtk-refresh", NULL);
+    refresh = gtk_image_menu_item_new_with_mnemonic(_("Re_fresh"));
+    refresh_icon = gtk_image_new_from_stock(GTK_STOCK_REFRESH,
+                                            GTK_ICON_SIZE_MENU);
+    gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(refresh), refresh_icon);
     gtk_widget_show(refresh);
     g_signal_connect(G_OBJECT(refresh), "activate",
                      G_CALLBACK(mi_click), data);