From 9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 13 Apr 2011 12:34:38 +0200 Subject: accounts_dialog_cms_prepare_cb: don't update the settings if we are already preparing one This may lead to ignoring the existing setting if it's a slow one to prepare (as Haze for example). (#647641) --- src/empathy-accounts-dialog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 83179a8b9..29d9b802e 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -2021,7 +2021,9 @@ accounts_dialog_cms_prepare_cb (GObject *source, if (!empathy_connection_managers_prepare_finish (cms, result, NULL)) goto out; - accounts_dialog_update_settings (dialog, NULL); + /* No need to update the settings if we are already preparing one */ + if (priv->settings_ready == NULL) + accounts_dialog_update_settings (dialog, NULL); if (priv->initial_selection != NULL) { -- cgit v1.2.3