aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonnylamb@gnome.org>2009-11-03 20:09:57 +0800
committerJonny Lamb <jonnylamb@gnome.org>2009-11-03 20:09:57 +0800
commitd06aae89f84d7bee74815879047e049aa99f39d7 (patch)
tree6b503bba42dfc78b195d7598a8194937c7d68afe
parent1529840ddfa801111b2292c99de75d7e32272324 (diff)
downloadgsoc2013-empathy-d06aae89f84d7bee74815879047e049aa99f39d7.tar
gsoc2013-empathy-d06aae89f84d7bee74815879047e049aa99f39d7.tar.gz
gsoc2013-empathy-d06aae89f84d7bee74815879047e049aa99f39d7.tar.bz2
gsoc2013-empathy-d06aae89f84d7bee74815879047e049aa99f39d7.tar.lz
gsoc2013-empathy-d06aae89f84d7bee74815879047e049aa99f39d7.tar.xz
gsoc2013-empathy-d06aae89f84d7bee74815879047e049aa99f39d7.tar.zst
gsoc2013-empathy-d06aae89f84d7bee74815879047e049aa99f39d7.zip
account-chooser: allow for a non-prepared account manager (fixes bug #600537)
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
-rw-r--r--libempathy-gtk/empathy-account-chooser.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 8256707c0..7624c2c13 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);