aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2013-11-22 02:09:16 +0800
committerPhilip Withnall <philip.withnall@collabora.co.uk>2013-11-25 18:50:04 +0800
commit0909d1f884c4542553d98b18e7622664d2a02169 (patch)
treee6f563f4e3504ce89908ca977d2762b5cf1230d6 /libempathy
parent561774b13b402c3f33b5264efc5abd091aa563cf (diff)
downloadgsoc2013-empathy-0909d1f884c4542553d98b18e7622664d2a02169.tar
gsoc2013-empathy-0909d1f884c4542553d98b18e7622664d2a02169.tar.gz
gsoc2013-empathy-0909d1f884c4542553d98b18e7622664d2a02169.tar.bz2
gsoc2013-empathy-0909d1f884c4542553d98b18e7622664d2a02169.tar.lz
gsoc2013-empathy-0909d1f884c4542553d98b18e7622664d2a02169.tar.xz
gsoc2013-empathy-0909d1f884c4542553d98b18e7622664d2a02169.tar.zst
gsoc2013-empathy-0909d1f884c4542553d98b18e7622664d2a02169.zip
libempathy: Remove empathy_create_individual_from_tp_contact()
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
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-utils.c20
-rw-r--r--libempathy/empathy-utils.h3
2 files changed, 0 insertions, 23 deletions
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 *
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 40291b971..a9ff0d890 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);