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

diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 3c3cb5646d10e2d5b5132f44884291537c6ff590..1165397f074d6ba942178f29c50246f076a9d16a 100644 (file)
--- 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;
       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;
 
       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);
         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);
 
       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_free (label);
       g_object_unref (contact);

-      g_object_unref (single_individual);

 
 while_finish:
       g_clear_object (&persona);
 
 while_finish:
       g_clear_object (&persona);