[empathy] account-chooser: allow for a non-prepared account manager (fixes bug #600537)



commit d06aae89f84d7bee74815879047e049aa99f39d7
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Tue Nov 3 12:09:57 2009 +0000

    account-chooser: allow for a non-prepared account manager (fixes bug #600537)
    
    Signed-off-by: Jonny Lamb <jonnylamb gnome org>

 libempathy-gtk/empathy-account-chooser.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 8256707..7624c2c 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -303,6 +303,14 @@ empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser)
 	priv = GET_PRIV (chooser);
 
 	account = empathy_account_chooser_dup_account (chooser);
+
+	/* if the returned account is NULL, then the account manager probably
+	 * hasn't been prepared yet. It should be safe to return NULL here
+	 * though. */
+	if (account == NULL) {
+		return NULL;
+	}
+
 	connection = tp_account_get_connection (account);
 	g_object_unref (account);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]