diff options
author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-06-17 00:58:03 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-12-22 17:46:18 +0800 |
commit | 88df5753cb658269ef9609825cd494ac463e0d6d (patch) | |
tree | a19d817ed3d6e679b09e749c4d64767b02284839 /libempathy-gtk | |
parent | bd4d801363ed6a5457c50d9c8e138c4f0e18f4b9 (diff) | |
download | gsoc2013-empathy-88df5753cb658269ef9609825cd494ac463e0d6d.tar gsoc2013-empathy-88df5753cb658269ef9609825cd494ac463e0d6d.tar.gz gsoc2013-empathy-88df5753cb658269ef9609825cd494ac463e0d6d.tar.bz2 gsoc2013-empathy-88df5753cb658269ef9609825cd494ac463e0d6d.tar.lz gsoc2013-empathy-88df5753cb658269ef9609825cd494ac463e0d6d.tar.xz gsoc2013-empathy-88df5753cb658269ef9609825cd494ac463e0d6d.tar.zst gsoc2013-empathy-88df5753cb658269ef9609825cd494ac463e0d6d.zip |
Begin combining the dialogs
This is not functional yet, but it does compile and kindof demonstrate what's
going to happen.
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=652670
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/empathy-account-widget.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index e314ad33f..be195fd8b 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -217,8 +217,8 @@ account_widget_set_control_buttons_sensitivity (EmpathyAccountWidget *self, return; gtk_widget_set_sensitive (priv->apply_button, sensitive); - gtk_widget_set_sensitive (priv->cancel_button, - (sensitive || priv->creating_account) && priv->other_accounts_exist); + // gtk_widget_set_sensitive (priv->cancel_button, + // (sensitive || priv->creating_account) && priv->other_accounts_exist); if (sensitive) { @@ -2197,6 +2197,7 @@ do_constructed (GObject *obj) /* 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); |