aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/merging/eab-contact-duplicate-detected.glade3
-rw-r--r--addressbook/gui/merging/eab-contact-merging.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index bf6eaa2f5e..60d233f51b 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-24 Suman Manjunath <msuman@novell.com>
+
+ ** Fix for bug #440328
+
+ * gui/merging/eab-contact-duplicate-detected.glade:
+ * gui/merging/eab-contact-merging.c: (mergeit): Missing mnemonics for
+ the 'Merge' buttons in two separate dialogs.
+
2007-08-23 Anand V M <avmuttagi@gmail.com>
** Fix for bug #353462
diff --git a/addressbook/gui/merging/eab-contact-duplicate-detected.glade b/addressbook/gui/merging/eab-contact-duplicate-detected.glade
index 4d6b4802ad..1a85fac29e 100644
--- a/addressbook/gui/merging/eab-contact-duplicate-detected.glade
+++ b/addressbook/gui/merging/eab-contact-duplicate-detected.glade
@@ -61,7 +61,8 @@
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">Merge</property>
+ <property name="label">_Merge</property>
+ <property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">2</property>
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index b4fb8f517b..903b730ddf 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -202,7 +202,7 @@ mergeit (EContactMergingLookup *lookup)
gtk_dialog_add_buttons ((GtkDialog *) dialog,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("Merge"), GTK_RESPONSE_OK,
+ _("_Merge"), GTK_RESPONSE_OK,
NULL);
email_attr_list = e_contact_get_attributes (lookup->match, E_CONTACT_EMAIL);