From cc12d897e6f0bc22a0e31e6ba6a37d940061dd07 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Thu, 28 Apr 2011 20:47:46 +1000 Subject: Only disable other accounts if we're creating an account --- libempathy-gtk/empathy-account-widget.c | 12 ++++++++---- 1 file 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); } -- cgit v1.2.3