diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-27 22:00:03 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-30 19:37:46 +0800 |
| commit | fc35b678523bc01e1475345a9e339f52eb5637a1 (patch) | |
| tree | 847dbd83936b1fa0d8cc57d4c848102b33cd94e8 /libempathy-gtk | |
| parent | 7bd4c5d096a48c7488774a9e0cc7f1f41e5b1e82 (diff) | |
| download | gsoc2013-empathy-fc35b678523bc01e1475345a9e339f52eb5637a1.tar gsoc2013-empathy-fc35b678523bc01e1475345a9e339f52eb5637a1.tar.gz gsoc2013-empathy-fc35b678523bc01e1475345a9e339f52eb5637a1.tar.bz2 gsoc2013-empathy-fc35b678523bc01e1475345a9e339f52eb5637a1.tar.lz gsoc2013-empathy-fc35b678523bc01e1475345a9e339f52eb5637a1.tar.xz gsoc2013-empathy-fc35b678523bc01e1475345a9e339f52eb5637a1.tar.zst gsoc2013-empathy-fc35b678523bc01e1475345a9e339f52eb5637a1.zip | |
fix accelerator conflict with the Cancel button (#623164)
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-account-widget.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 9696f48d8..6755ddbf6 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -1735,8 +1735,16 @@ do_constructed (GObject *obj) if (!priv->simple) { GtkWidget *hbox = gtk_hbox_new (TRUE, 3); + GtkWidget *image; + + /* We can't use the stock button as its accelerator ('C') clashes with + * the Close button. */ + 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); - priv->cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); + image = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (priv->cancel_button), image); priv->apply_button = gtk_button_new (); set_apply_button (self); |