[network-manager-applet] editor: fix mnemonics for wired and wireless pages (rh #787479)

[JiÅÃ KlimeÅ <jklimes src gnome org>]

commit 705efdda3c9ce5922972e2850a7b66b4a20fed8b
Author: JiÅÃ KlimeÅ <jklimes redhat com>
Date:   Thu Feb 9 11:00:40 2012 +0100

    editor: fix mnemonics for wired and wireless pages (rh #787479)

 src/connection-editor/ce-page-wired.ui        |    7 +++----
 src/connection-editor/ce-page-wireless.ui     |    7 +++----
 src/connection-editor/nm-connection-editor.ui |    1 +
 src/connection-editor/page-wired.c            |    5 +++++
 src/connection-editor/page-wireless.c         |    5 +++++
 5 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/src/connection-editor/ce-page-wired.ui b/src/connection-editor/ce-page-wired.ui
index 29fa3f9..d230c12 100644
--- a/src/connection-editor/ce-page-wired.ui
+++ b/src/connection-editor/ce-page-wired.ui
@@ -160,12 +160,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label26">
+          <object class="GtkLabel" id="wired_device_mac_label">
             <property name="visible">True</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">_Device MAC address:</property>
             <property name="use_underline">True</property>
-            <property name="mnemonic_widget">wired_device_mac</property>
           </object>
           <packing>
             <property name="top_attach">4</property>
@@ -194,7 +193,7 @@
           <object class="GtkLabel" id="label27">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Cloned MAC address:</property>
+            <property name="label" translatable="yes">C_loned MAC address:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wired_cloned_mac</property>
           </object>
@@ -223,7 +222,7 @@
           <object class="GtkLabel" id="label28">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">MT_U:</property>
+            <property name="label" translatable="yes">_MTU:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wired_mtu</property>
           </object>
diff --git a/src/connection-editor/ce-page-wireless.ui b/src/connection-editor/ce-page-wireless.ui
index e3923e8..93b30cd 100644
--- a/src/connection-editor/ce-page-wireless.ui
+++ b/src/connection-editor/ce-page-wireless.ui
@@ -105,7 +105,7 @@
           <object class="GtkLabel" id="wireless_mtu_label">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">MT_U:</property>
+            <property name="label" translatable="yes">_MTU:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wireless_mtu</property>
           </object>
@@ -138,7 +138,6 @@
             <property name="xalign">0</property>
             <property name="label" translatable="yes">_Device MAC address:</property>
             <property name="use_underline">True</property>
-            <property name="mnemonic_widget">wireless_device_mac</property>
           </object>
           <packing>
             <property name="top_attach">7</property>
@@ -165,7 +164,7 @@
           <object class="GtkLabel" id="wireless_cloned_mac_label">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Cloned MAC address:</property>
+            <property name="label" translatable="yes">C_loned MAC address:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wireless_cloned_mac</property>
           </object>
@@ -424,7 +423,7 @@
           <object class="GtkLabel" id="wireless_ssid_label">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_SSID:</property>
+            <property name="label" translatable="yes">SS_ID:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wireless_ssid</property>
           </object>
diff --git a/src/connection-editor/nm-connection-editor.ui b/src/connection-editor/nm-connection-editor.ui
index 2c62760..35e8b5b 100644
--- a/src/connection-editor/nm-connection-editor.ui
+++ b/src/connection-editor/nm-connection-editor.ui
@@ -504,6 +504,7 @@
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Connection _name:</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">connection_name</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/src/connection-editor/page-wired.c b/src/connection-editor/page-wired.c
index bf7e6ad..d202558 100644
--- a/src/connection-editor/page-wired.c
+++ b/src/connection-editor/page-wired.c
@@ -74,6 +74,7 @@ wired_private_init (CEPageWired *self)
 	CEPageWiredPrivate *priv = CE_PAGE_WIRED_GET_PRIVATE (self);
 	GtkBuilder *builder;
 	GtkWidget *align;
+	GtkLabel *label;
 
 	builder = CE_PAGE (self)->builder;
 
@@ -91,6 +92,10 @@ wired_private_init (CEPageWired *self)
 	gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->device_mac));
 	gtk_widget_show_all (GTK_WIDGET (priv->device_mac));
 
+	/* Set mnemonic widget for device MAC label */
+	label = GTK_LABEL (GTK_WIDGET (gtk_builder_get_object (builder, "wired_device_mac_label")));
+	gtk_label_set_mnemonic_widget (label, GTK_WIDGET (priv->device_mac));
+
 	priv->cloned_mac = GTK_ENTRY (GTK_WIDGET (gtk_builder_get_object (builder, "wired_cloned_mac")));
 	priv->port = GTK_COMBO_BOX (GTK_WIDGET (gtk_builder_get_object (builder, "wired_port")));
 	priv->speed = GTK_COMBO_BOX (GTK_WIDGET (gtk_builder_get_object (builder, "wired_speed")));
diff --git a/src/connection-editor/page-wireless.c b/src/connection-editor/page-wireless.c
index 5861893..fcf9f91 100644
--- a/src/connection-editor/page-wireless.c
+++ b/src/connection-editor/page-wireless.c
@@ -70,6 +70,7 @@ wireless_private_init (CEPageWireless *self)
 	GtkBuilder *builder;
 	GtkWidget *widget;
 	GtkWidget *align;
+	GtkLabel *label;
 
 	builder = CE_PAGE (self)->builder;
 
@@ -96,6 +97,10 @@ wireless_private_init (CEPageWireless *self)
 	gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->device_mac));
 	gtk_widget_show_all (GTK_WIDGET (priv->device_mac));
 
+	/* Set mnemonic widget for device MAC label */
+	label = GTK_LABEL (GTK_WIDGET (gtk_builder_get_object (builder, "wireless_device_mac_label")));
+	gtk_label_set_mnemonic_widget (label, GTK_WIDGET (priv->device_mac));
+
 	priv->rate     = GTK_SPIN_BUTTON (GTK_WIDGET (gtk_builder_get_object (builder, "wireless_rate")));
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "rate_units"));
 	gtk_size_group_add_widget (priv->group, widget);