aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-02-24 23:05:15 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-02-24 23:05:15 +0800
commitd66105db6105b9ffc3ede09b2513f1243e0a426d (patch)
tree6338b67bafd4c30e246e661fac99c2bd05f1aab6 /libempathy
parent6ba961fc2bd6d0e1e5b58ad5509ed0b63c427c74 (diff)
downloadgsoc2013-empathy-d66105db6105b9ffc3ede09b2513f1243e0a426d.tar
gsoc2013-empathy-d66105db6105b9ffc3ede09b2513f1243e0a426d.tar.gz
gsoc2013-empathy-d66105db6105b9ffc3ede09b2513f1243e0a426d.tar.bz2
gsoc2013-empathy-d66105db6105b9ffc3ede09b2513f1243e0a426d.tar.lz
gsoc2013-empathy-d66105db6105b9ffc3ede09b2513f1243e0a426d.tar.xz
gsoc2013-empathy-d66105db6105b9ffc3ede09b2513f1243e0a426d.tar.zst
gsoc2013-empathy-d66105db6105b9ffc3ede09b2513f1243e0a426d.zip
empathy_account_settings_has_account: cope with priv->account being NULL
priv->account is not garantee to be set so empathy_account_settings_has_account shouldn't assume it is (#610942).
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-account-settings.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 40df9a802..78b14456e 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -1245,6 +1245,9 @@ empathy_account_settings_has_account (EmpathyAccountSettings *settings,
priv = GET_PRIV (settings);
+ if (priv->account == NULL)
+ return FALSE;
+
account_path = tp_proxy_get_object_path (TP_PROXY (account));
priv_account_path = tp_proxy_get_object_path (TP_PROXY (priv->account));