aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-11-06 21:51:59 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-11-06 21:58:43 +0800
commitcc66599afc20a641f264565593de4075eb86810b (patch)
treeaa50c29492d778444404bac70cff7d4b0af649a7
parent6d6b41a31fb589cfa6b176c8935771c341099934 (diff)
downloadgsoc2013-empathy-cc66599afc20a641f264565593de4075eb86810b.tar
gsoc2013-empathy-cc66599afc20a641f264565593de4075eb86810b.tar.gz
gsoc2013-empathy-cc66599afc20a641f264565593de4075eb86810b.tar.bz2
gsoc2013-empathy-cc66599afc20a641f264565593de4075eb86810b.tar.lz
gsoc2013-empathy-cc66599afc20a641f264565593de4075eb86810b.tar.xz
gsoc2013-empathy-cc66599afc20a641f264565593de4075eb86810b.tar.zst
gsoc2013-empathy-cc66599afc20a641f264565593de4075eb86810b.zip
account-widget: Change the label of the Connect button to 'Login'.
This used to be a Moblin specific change but it makes sense for GNOME as well (#600962).
-rw-r--r--libempathy-gtk/empathy-account-widget.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index a8646d2bc..d77378765 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -1268,7 +1268,6 @@ do_constructed (GObject *obj)
if (!priv->simple)
{
GtkWidget *hbox = gtk_hbox_new (TRUE, 3);
- const gchar *apply_button_id;
priv->cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
@@ -1284,30 +1283,26 @@ do_constructed (GObject *obj)
if (state > TP_CONNECTION_PRESENCE_TYPE_OFFLINE)
{
- /* We are online, display a Connect button */
- apply_button_id = GTK_STOCK_CONNECT;
+ /* We are online, display a Login button */
+ GtkWidget *image;
+
+ priv->apply_button = gtk_button_new_with_mnemonic (_("L_og in"));
+ image = gtk_image_new_from_stock (GTK_STOCK_CONNECT,
+ GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image (GTK_BUTTON (priv->apply_button), image);
}
else
{
/* We are offline, display a Save button */
- apply_button_id = GTK_STOCK_SAVE;
+ priv->apply_button = gtk_button_new_from_stock (GTK_STOCK_SAVE);
}
}
else
{
/* We are editing an existing account, display an Apply button */
- apply_button_id = GTK_STOCK_APPLY;
+ priv->apply_button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
}
- priv->apply_button = gtk_button_new_from_stock (apply_button_id);
-
-#ifdef HAVE_MOBLIN
- if (priv->creating_account)
- /* Translators: this is used only when built on a moblin platform */
- gtk_button_set_label (GTK_BUTTON (priv->apply_button),
- _("L_og in"));
-#endif
-
gtk_box_pack_end (GTK_BOX (hbox), priv->apply_button, TRUE,
TRUE, 3);
gtk_box_pack_end (GTK_BOX (hbox), priv->cancel_button, TRUE,