diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2013-11-21 18:09:16 +0000 |
|---|---|---|
| committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2013-11-25 10:51:53 +0000 |
| commit | 96f2a474e0cdc5f8fe8a482d14a1a97c519def3a (patch) | |
| tree | eab3cbdb8cc7f9d79c1f309f1c1fcdf7731facb7 /libempathy-gtk | |
| parent | 8defe68d6698b61146f4c91aa7fed82babc5a868 (diff) | |
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-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-contact-chooser.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-menu.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-store-channel.c | 2 |
3 files changed, 3 insertions, 3 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; |