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.

diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 4a4afae18641e3dd6ea985cbddf34accd23c33b1..abfda9f8f76ca1486a8afe4f7d3be013be369c6d 100644 (file)
--- 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);
         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);
 
 
       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);
 
       priv->apply_button = gtk_button_new ();
       set_apply_button (self);