From d1d3a49fc919ed734b77a6e94afb2d49109182f2 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Mon, 27 Jun 2011 14:31:25 -0700 Subject: Don't assume that all TpfPersonas contain valid TpContacts Helps: bgo#653599 - Empathy shouldn't assume all TpfPersonas contain a valid TpContact Signed-off-by: Jonny Lamb --- libempathy/empathy-utils.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libempathy/empathy-utils.c') diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 04a6c7836..9a0d16707 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -715,8 +715,11 @@ empathy_contact_dup_from_folks_individual (FolksIndividual *individual) TpContact *tp_contact; tp_contact = tpf_persona_get_contact (persona); - contact = empathy_contact_dup_from_tp_contact (tp_contact); - empathy_contact_set_persona (contact, FOLKS_PERSONA (persona)); + if (tp_contact != NULL) + { + contact = empathy_contact_dup_from_tp_contact (tp_contact); + empathy_contact_set_persona (contact, FOLKS_PERSONA (persona)); + } } g_clear_object (&persona); } -- cgit v1.2.3