[empathy/gnome-2-34: 31/60] account-settings: don't call TpAccount functions if we've not created it yet

[Jonny Lamb <jonnylamb src gnome org>]

commit 95bf4742dea9bdb83dd1bc4cec9730ca6a091c24
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Wed Dec 8 12:57:45 2010 +0000

    account-settings: don't call TpAccount functions if we've not created it yet
    
    We're creating the account so the account isn't around yet.
    
    Signed-off-by: Jonny Lamb <jonnylamb gnome org>

 libempathy/empathy-account-settings.c |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index fa28190..8a92dfd 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -212,8 +212,17 @@ empathy_account_settings_constructed (GObject *object)
 
   if (!priv->ready)
     {
-      tp_account_prepare_async (priv->account, NULL,
-          empathy_account_settings_account_ready_cb, self);
+      GQuark features[] = {
+          TP_ACCOUNT_FEATURE_CORE,
+          TP_ACCOUNT_FEATURE_STORAGE,
+          0 };
+
+      if (priv->account != NULL)
+        {
+          tp_proxy_prepare_async (priv->account, features,
+              empathy_account_settings_account_ready_cb, self);
+        }
+
       tp_g_signal_connect_object (priv->managers, "notify::ready",
         G_CALLBACK (empathy_account_settings_managers_ready_cb), object, 0);
     }
@@ -503,8 +512,10 @@ empathy_account_settings_check_readyness (EmpathyAccountSettings *self)
         }
     }
 
+  /* priv->account won't be a proper account if it's the account
+   * assistant showing this widget. */
   if (priv->supports_sasl && !priv->password_retrieved
-      && !priv->password_requested)
+      && !priv->password_requested && priv->account != NULL)
     {
       priv->password_requested = TRUE;