EmpathyContact: don't crash if a contact doesn't have an account

https://bugzilla.gnome.org/show_bug.cgi?id=654256

diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index ed7af6c3822c3022034b4350e41b9fcc61553784..16f1dc90002364c556647d1e4079ae43d43b2b26 100644 (file)
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -683,12 +683,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 *