individual-menu: stop creating single_individual

[empathy.git] / libempathy-gtk / empathy-individual-menu.c

diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index ae489a77ae71e76be123c79ac75918e18920a664..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;
-      /* 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);
@@ -255,26 +246,11 @@ individual_menu_add_personas (EmpathyIndividualMenu *self,
       gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
       gtk_widget_show (action);
 
-      /* Block */
-      if (features & EMPATHY_INDIVIDUAL_FEATURE_BLOCK &&
-          (item = block_menu_item_new_individual (single_individual))
-          != NULL) {
-        GtkWidget *sep;
-
-        sep = gtk_separator_menu_item_new ();
-        gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), sep);
-        gtk_widget_show (sep);
-
-        gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), item);
-        gtk_widget_show (item);
-      }
-
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), contact_item);
       gtk_widget_show (contact_item);
 
       g_free (label);
       g_object_unref (contact);
-      g_object_unref (single_individual);
 
 while_finish:
       g_clear_object (&persona);