[empathy] individual-menu: stop creating single_individual
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] individual-menu: stop creating single_individual
- Date: Mon, 23 Jun 2014 15:18:43 +0000 (UTC)
commit 8ac7209da2305762f9ef2c711c555afb19e85b62
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Jun 23 15:35:03 2014 +0200
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
libempathy-gtk/empathy-individual-menu.c | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
---
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 3c3cb56..1165397 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]