aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy/empathy-account-settings.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index abfc8f0ec..e0a24b4d6 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -238,8 +238,12 @@ empathy_account_settings_constructed (GObject *object)
TP_ACCOUNT_FEATURE_STORAGE,
0 };
- tp_proxy_prepare_async (priv->account, features,
- empathy_account_settings_account_ready_cb, self);
+ 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);
}
@@ -540,8 +544,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;