From dc2953040b0fb9576411d2f145e7e6ff11dd989a Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 13 Oct 2009 11:36:04 +0200
Subject: Bug #498095 - Fixing mnemonics

---
 addressbook/gui/contact-list-editor/contact-list-editor.glade | 4 +++-
 calendar/gui/dialogs/alarm-dialog.glade                       | 4 ++--
 mail/message-tag-followup.c                                   | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.glade b/addressbook/gui/contact-list-editor/contact-list-editor.glade
index 497be08c85..63e68aa348 100644
--- a/addressbook/gui/contact-list-editor/contact-list-editor.glade
+++ b/addressbook/gui/contact-list-editor/contact-list-editor.glade
@@ -63,6 +63,7 @@
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes" context="yes">_Where:</property>
                     <property name="use_underline">True</property>
+		    <property name="mnemonic_widget">source-combo-box</property>
                   </widget>
                   <packing>
                     <property name="top_attach">1</property>
@@ -250,9 +251,10 @@
                                 <property name="can_default">True</property>
                                 <property name="has_default">True</property>
                                 <property name="has_tooltip">True</property>
+				<property name="use_underline">True</property>
                                 <property name="tooltip_markup">Insert email addresses from Address Book</property>
                                 <property name="tooltip_text">Insert email addresses from Address Book</property>
-                                <property name="label" translatable="yes" context="yes">Select...</property>
+                                <property name="label" translatable="yes" context="yes">_Select...</property>
                                 <property name="response_id">0</property>
                                 <signal name="clicked" handler="contact_list_editor_select_button_clicked_cb"/>
                               </widget>
diff --git a/calendar/gui/dialogs/alarm-dialog.glade b/calendar/gui/dialogs/alarm-dialog.glade
index 5b5be4f61f..6bf58aab63 100644
--- a/calendar/gui/dialogs/alarm-dialog.glade
+++ b/calendar/gui/dialogs/alarm-dialog.glade
@@ -528,7 +528,7 @@ days</property>
 			      <property name="yalign">0</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">option-notebook</property>
+			      <property name="mnemonic_widget">dalarm-description</property>
 			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			      <property name="width_chars">-1</property>
 			      <property name="single_line_mode">False</property>
@@ -1005,7 +1005,7 @@ days</property>
 				      <property name="yalign">0</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">option-notebook</property>
+				      <property name="mnemonic_widget">malarm-description</property>
 				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				      <property name="width_chars">-1</property>
 				      <property name="single_line_mode">False</property>
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index 6ccd74459a..5141387b01 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -320,6 +320,8 @@ construct (MessageTagEditor *editor)
 	g_signal_connect (followup->completed, "toggled", G_CALLBACK (completed_toggled), followup);
 
 	followup->clear = GTK_BUTTON (glade_xml_get_widget (gui, "clear"));
+	gtk_button_set_label (followup->clear, _("Clea_r"));
+	gtk_button_set_image (followup->clear, gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_BUTTON));
 	g_signal_connect (followup->clear, "clicked", G_CALLBACK (clear_clicked), followup);
 
 	g_object_unref (gui);
-- 
cgit v1.2.3