From 0909d1f884c4542553d98b18e7622664d2a02169 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 21 Nov 2013 18:09:16 +0000 Subject: libempathy: Remove empathy_create_individual_from_tp_contact() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It has been replaced by empathy_ensure_individual_from_tp_contact(), which can’t cause internal state corruption in libfolks by wrapping an existing Persona in a second Individual when it’s already wrapped in one. This has also been fixed in libfolks. See: https://bugzilla.redhat.com/show_bug.cgi?id=1031252 https://bugzilla.gnome.org/show_bug.cgi?id=712839 --- libempathy/empathy-utils.c | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'libempathy/empathy-utils.c') diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 4130627e7..e83493736 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -946,26 +946,6 @@ create_individual_from_persona (FolksPersona *persona) return individual; } -FolksIndividual * -empathy_create_individual_from_tp_contact (TpContact *contact) -{ - TpfPersona *persona; - FolksIndividual *individual; - - persona = tpf_persona_dup_for_contact (contact); - if (persona == NULL) - { - DEBUG ("Failed to get a persona for %s", - tp_contact_get_identifier (contact)); - return NULL; - } - - individual = create_individual_from_persona (FOLKS_PERSONA (persona)); - - g_object_unref (persona); - return individual; -} - /* Look for a FolksIndividual containing @contact as one of his persona * and create one if needed */ FolksIndividual * -- cgit v1.2.3