[empathy] individual_menu_add_personas(): restore the persona.individual after creating single_individual

[Guillaume Desmottes <gdesmott src gnome org>]

commit 3657e2642f635deca2e10695bba0dd8894613d68
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Sep 28 12:05:33 2012 +0200

    individual_menu_add_personas(): restore the persona.individual after creating single_individual
    
    https://bugzilla.gnome.org/show_bug.cgi?id=684971

 libempathy-gtk/empathy-individual-menu.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index e597481..b85f76d 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -163,6 +163,11 @@ individual_menu_add_personas (GtkMenuShell *menu,
       single_individual = empathy_create_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);