aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-12-16 22:52:26 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-12-22 17:46:19 +0800
commit08dfc1a2e4c9dd8e01cab338127c15d6a7ab51de (patch)
treecf7e256f1a681d401987d90fea4734d5aaef25f0
parent5d7d9fdcd879d3a6ccf93eb234d38bbb45701fa9 (diff)
downloadgsoc2013-empathy-08dfc1a2e4c9dd8e01cab338127c15d6a7ab51de.tar
gsoc2013-empathy-08dfc1a2e4c9dd8e01cab338127c15d6a7ab51de.tar.gz
gsoc2013-empathy-08dfc1a2e4c9dd8e01cab338127c15d6a7ab51de.tar.bz2
gsoc2013-empathy-08dfc1a2e4c9dd8e01cab338127c15d6a7ab51de.tar.lz
gsoc2013-empathy-08dfc1a2e4c9dd8e01cab338127c15d6a7ab51de.tar.xz
gsoc2013-empathy-08dfc1a2e4c9dd8e01cab338127c15d6a7ab51de.tar.zst
gsoc2013-empathy-08dfc1a2e4c9dd8e01cab338127c15d6a7ab51de.zip
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.
-rw-r--r--libempathy-gtk/empathy-account-widget.c11
1 files changed, 1 insertions, 10 deletions
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);