aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-04-13 18:34:38 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-04-18 22:38:01 +0800
commit9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734 (patch)
treee0f85bc242e357962ded8acf19752bc27f660cda
parentf3b23695b79b4eee34619e36c9f7c37160674de5 (diff)
downloadgsoc2013-empathy-9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734.tar
gsoc2013-empathy-9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734.tar.gz
gsoc2013-empathy-9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734.tar.bz2
gsoc2013-empathy-9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734.tar.lz
gsoc2013-empathy-9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734.tar.xz
gsoc2013-empathy-9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734.tar.zst
gsoc2013-empathy-9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734.zip
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)
-rw-r--r--src/empathy-accounts-dialog.c4
1 files changed, 3 insertions, 1 deletions
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)
{