From 08dfc1a2e4c9dd8e01cab338127c15d6a7ab51de Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 16 Dec 2011 15:52:26 +0100 Subject: we can now use the stock close button We should use the official accelerator for closing dialog. If widget fields are also using the 'C' accelerator then they should be fixed. --- libempathy-gtk/empathy-account-widget.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 4a4afae18..abfda9f8f 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -2195,19 +2195,10 @@ do_constructed (GObject *obj) TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS)) { GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); - GtkWidget *image; gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE); - /* We can't use the stock button as its accelerator ('C') clashes with - * the Close button. */ - /* FIXME: this no longer applies! */ - priv->cancel_button = gtk_button_new (); - gtk_button_set_label (GTK_BUTTON (priv->cancel_button), _("Ca_ncel")); - gtk_button_set_use_underline (GTK_BUTTON (priv->cancel_button), TRUE); - - image = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (priv->cancel_button), image); + priv->cancel_button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); priv->apply_button = gtk_button_new (); set_apply_button (self); -- cgit v1.2.3