[empathy/gnome-3-0] accounts_dialog_cms_prepare_cb: don't update the settings if we are already preparing one

[Guillaume Desmottes <gdesmott src gnome org>]

commit eb3da179975198c9368f9e3d73a54d2d60097faf
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Apr 13 12:34:38 2011 +0200

    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 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 83179a8..29d9b80 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)
     {