aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-04-28 18:47:46 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-04-28 18:47:46 +0800
commitcc12d897e6f0bc22a0e31e6ba6a37d940061dd07 (patch)
tree3182c4f6bffb6c1affdc1d06febab23e3235718c
parent8a5cc3dbf497e0ed99bb7254dcf584d832647d0a (diff)
downloadgsoc2013-empathy-cc12d897e6f0bc22a0e31e6ba6a37d940061dd07.tar
gsoc2013-empathy-cc12d897e6f0bc22a0e31e6ba6a37d940061dd07.tar.gz
gsoc2013-empathy-cc12d897e6f0bc22a0e31e6ba6a37d940061dd07.tar.bz2
gsoc2013-empathy-cc12d897e6f0bc22a0e31e6ba6a37d940061dd07.tar.lz
gsoc2013-empathy-cc12d897e6f0bc22a0e31e6ba6a37d940061dd07.tar.xz
gsoc2013-empathy-cc12d897e6f0bc22a0e31e6ba6a37d940061dd07.tar.zst
gsoc2013-empathy-cc12d897e6f0bc22a0e31e6ba6a37d940061dd07.zip
Only disable other accounts if we're creating an account
-rw-r--r--libempathy-gtk/empathy-account-widget.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index ef764fb5d..edc2f98eb 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -866,16 +866,20 @@ static void
account_widget_apply_clicked_cb (GtkWidget *button,
EmpathyAccountWidget *self)
{
+ EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
GtkWidget *parent;
parent = gtk_widget_get_toplevel (button);
if (!GTK_IS_WINDOW (parent) || !gtk_widget_is_toplevel (parent))
parent = NULL;
- if (!empathy_accounts_dialog_skype_disable_other_accounts (NULL,
- GTK_WINDOW (parent)))
- /* the user chose not to proceed */
- return;
+ if (priv->creating_account)
+ {
+ if (!empathy_accounts_dialog_skype_disable_other_accounts (NULL,
+ GTK_WINDOW (parent)))
+ /* the user chose not to proceed */
+ return;
+ }
account_widget_apply_and_log_in (self);
}