From 0909d1f884c4542553d98b18e7622664d2a02169 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 21 Nov 2013 18:09:16 +0000 Subject: [PATCH] libempathy: Remove empathy_create_individual_from_tp_contact() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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-gtk/empathy-contact-chooser.c | 2 +- libempathy-gtk/empathy-individual-menu.c | 2 +- .../empathy-individual-store-channel.c | 2 +- libempathy/empathy-utils.c | 20 ------------------- libempathy/empathy-utils.h | 3 --- 5 files changed, 3 insertions(+), 26 deletions(-) diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c index e31b22fe..b82aa93a 100644 --- a/libempathy-gtk/empathy-contact-chooser.c +++ b/libempathy-gtk/empathy-contact-chooser.c @@ -232,7 +232,7 @@ get_contacts_cb (GObject *source, /* another request has been started */ goto out; - individual = empathy_create_individual_from_tp_contact (contact); + individual = empathy_ensure_individual_from_tp_contact (contact); if (individual == NULL) goto out; diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index b7b0abe8..7f53a7a8 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -164,7 +164,7 @@ individual_menu_add_personas (EmpathyIndividualMenu *self, goto while_finish; contact = empathy_contact_dup_from_tp_contact (tp_contact); - single_individual = empathy_create_individual_from_tp_contact ( + single_individual = empathy_ensure_individual_from_tp_contact ( tp_contact); /* Pretty hacky. Creating single_individual had a side effect to change diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c index 4064da05..a18bc33d 100644 --- a/libempathy-gtk/empathy-individual-store-channel.c +++ b/libempathy-gtk/empathy-individual-store-channel.c @@ -70,7 +70,7 @@ add_members (EmpathyIndividualStoreChannel *self, if (g_hash_table_lookup (self->priv->individuals, contact) != NULL) continue; - individual = empathy_create_individual_from_tp_contact (contact); + individual = empathy_ensure_individual_from_tp_contact (contact); if (individual == NULL) return; diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 4130627e..e8349373 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 * diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index 40291b97..a9ff0d89 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -102,9 +102,6 @@ void empathy_individual_can_audio_video_call (FolksIndividual *individual, gboolean empathy_client_types_contains_mobile_device ( const GStrv types); -FolksIndividual * empathy_create_individual_from_tp_contact ( - TpContact *contact); - FolksIndividual * empathy_ensure_individual_from_tp_contact ( TpContact *contact); -- 2.39.2