diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-04-13 12:34:38 +0200 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-04-18 16:38:37 +0200 |
commit | eb3da179975198c9368f9e3d73a54d2d60097faf (patch) | |
tree | bfac2130cd914895cb684c51588e83ddc13f821b | |
parent | 7c8d031f4f0efdca0894c21a031df6beb4d43de7 (diff) | |
download | empathy-eb3da179975198c9368f9e3d73a54d2d60097faf.tar.gz |
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.c | 4 |
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) { |