diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-07-11 17:45:41 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-07-19 01:47:56 +0800 |
| commit | 8e8bf4d767c5a9afbd7fa5bb08aa6e4032c77989 (patch) | |
| tree | 2f00f7e95a76a460326ecd07e783fcbed20c34fb | |
| parent | 6070a1ef9edbaba3c357705bc7618e3708d51643 (diff) | |
| download | gsoc2013-empathy-8e8bf4d767c5a9afbd7fa5bb08aa6e4032c77989.tar gsoc2013-empathy-8e8bf4d767c5a9afbd7fa5bb08aa6e4032c77989.tar.gz gsoc2013-empathy-8e8bf4d767c5a9afbd7fa5bb08aa6e4032c77989.tar.bz2 gsoc2013-empathy-8e8bf4d767c5a9afbd7fa5bb08aa6e4032c77989.tar.lz gsoc2013-empathy-8e8bf4d767c5a9afbd7fa5bb08aa6e4032c77989.tar.xz gsoc2013-empathy-8e8bf4d767c5a9afbd7fa5bb08aa6e4032c77989.tar.zst gsoc2013-empathy-8e8bf4d767c5a9afbd7fa5bb08aa6e4032c77989.zip | |
EmpathyContact: don't crash if a contact doesn't have an account
https://bugzilla.gnome.org/show_bug.cgi?id=654256
| -rw-r--r-- | libempathy/empathy-contact.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 52dc72bb3..d21cc658a 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -640,12 +640,15 @@ contact_is_tpl_entity (gpointer key, { EmpathyContact *contact = value; FindContactData *data = user_data; + TpAccount *account = empathy_contact_get_account (contact); + const gchar *path = NULL; + + if (account != NULL) + path = tp_proxy_get_object_path (account); return !tp_strdiff (empathy_contact_get_id (contact), tpl_entity_get_identifier (data->entity)) && - !tp_strdiff (tp_proxy_get_object_path (data->account), - tp_proxy_get_object_path ( - empathy_contact_get_account (contact))); + !tp_strdiff (tp_proxy_get_object_path (data->account), path); } EmpathyContact * |