[empathy] fix accelerator conflict with the Cancel button (#623164)

[Guillaume Desmottes <gdesmott src gnome org>]

commit fc35b678523bc01e1475345a9e339f52eb5637a1
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Aug 27 16:00:03 2010 +0200

    fix accelerator conflict with the Cancel button (#623164)

 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 9696f48..6755ddb 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);