aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-06-23 21:35:03 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-06-23 21:36:26 +0800
commit8ac7209da2305762f9ef2c711c555afb19e85b62 (patch)
treeb9be9d0d2eae9cc247b5173055cf6b6b5d5487c6
parenta2a7b6ecc313022e4e0904651ba4b27ae83ca293 (diff)
downloadgsoc2013-empathy-8ac7209da2305762f9ef2c711c555afb19e85b62.tar
gsoc2013-empathy-8ac7209da2305762f9ef2c711c555afb19e85b62.tar.gz
gsoc2013-empathy-8ac7209da2305762f9ef2c711c555afb19e85b62.tar.bz2
gsoc2013-empathy-8ac7209da2305762f9ef2c711c555afb19e85b62.tar.lz
gsoc2013-empathy-8ac7209da2305762f9ef2c711c555afb19e85b62.tar.xz
gsoc2013-empathy-8ac7209da2305762f9ef2c711c555afb19e85b62.tar.zst
gsoc2013-empathy-8ac7209da2305762f9ef2c711c555afb19e85b62.zip
individual-menu: stop creating single_individual
This code was always pretty hacky and created loads of nasty bugs so I'm glad to get rid of it. https://bugzilla.gnome.org/show_bug.cgi?id=732100
-rw-r--r--libempathy-gtk/empathy-individual-menu.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 3c3cb5646..1165397f0 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -162,8 +162,6 @@ individual_menu_add_personas (EmpathyIndividualMenu *self,
FolksPersonaStore *store;
const gchar *account;
GtkWidget *action;
- /* Individual containing only persona */
- FolksIndividual *single_individual;
if (!empathy_folks_persona_is_interesting (FOLKS_PERSONA (persona)))
goto while_finish;
@@ -173,13 +171,6 @@ individual_menu_add_personas (EmpathyIndividualMenu *self,
goto while_finish;
contact = empathy_contact_dup_from_tp_contact (tp_contact);
- single_individual = empathy_ensure_individual_from_tp_contact (
- tp_contact);
-
- /* Pretty hacky. Creating single_individual had a side effect to change
- * persona.individual from individual to single_individual which is not
- * what we want so we set it back. See bgo#684971 for details. */
- g_object_set (persona, "individual", individual, NULL);
store = folks_persona_get_store (FOLKS_PERSONA (persona));
account = folks_persona_store_get_display_name (store);
@@ -260,7 +251,6 @@ individual_menu_add_personas (EmpathyIndividualMenu *self,
g_free (label);
g_object_unref (contact);
- g_object_unref (single_individual);
while_finish:
g_clear_object (&persona);