Made the Close button the default widget in the contact edit dialog. (Jonny Lamb)

Having this Close button the default widget in the contact edit dialog
allows one to enter/edit a contact's alias, and press return when
finished, instead of TABing one's to Close, or worse, having to
use the mouse!

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1207

diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index fd4ad96358781b389b566247b9a29404111dd5aa..7aae812a403a8aacfe87bffe9d22861315c23506 100644 (file)
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -192,6 +192,8 @@ empathy_contact_information_dialog_show (EmpathyContact *contact,
        gtk_dialog_add_action_widget (GTK_DIALOG (dialog),
                                      button,
                                      GTK_RESPONSE_CLOSE);
+       GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+       gtk_window_set_default (GTK_WINDOW (dialog), button);
        gtk_widget_show (button);
 
        /* Contact info widget */

diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index b80cef2e90c7271449f217c8b18f57b0b61af00c..4a29d15dee5878f10ad1bb63dd6a2c88e15665a6 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -406,6 +406,8 @@ contact_widget_contact_setup (EmpathyContactWidget *information)
                g_signal_connect (information->widget_alias, "focus-out-event",
                                  G_CALLBACK (contact_widget_entry_alias_focus_event_cb),
                                  information);
+               /* Make return activate the window default (the Close button) */
+               gtk_entry_set_activates_default (GTK_ENTRY (information->widget_alias), TRUE);
        } else {
                information->widget_alias = gtk_label_new (NULL);
                gtk_label_set_selectable (GTK_LABEL (information->widget_alias), TRUE);