Ensure all persona tables are removed from EmpathyIndividualWidget

In the case that EmpathyIndividualWidget is going from showing Personas to
showing an Individual table, ensure that all persona tables are removed from
the widget, including those for Personas who're being removed from the
Individual. Closes: bgo#628481

diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 7e4be2235ecdaf244b6e05136726368af1ef6a18..40ece1eec6a2ecc2451aa290253c08cde84dccb8 100644 (file)
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -1676,6 +1676,8 @@ personas_changed_cb (FolksIndividual *individual,
       /* Remove all Personas */
       for (l = personas; l != NULL; l = l->next)
         remove_persona (self, FOLKS_PERSONA (l->data));
+      for (l = removed; l != NULL; l = l->next)
+        remove_persona (self, FOLKS_PERSONA (l->data));
 
       /* Set up the Individual table instead */
       individual_table_set_up (self);