individual_grid_destroy: remove the ChamplainEmbedView from its container

The EmpathyIndividualWidget object is re-used for tooltips so we should remove
the ChamplainEmbedView before trying to add a new one.

https://bugzilla.gnome.org/show_bug.cgi?id=661500

diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 5a1c559d13229262613f68d6ee7005dd7cce29ff..cba2784776ef1efebb4d7249643ab4059e615367 100644 (file)
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -1675,6 +1675,17 @@ individual_grid_destroy (EmpathyIndividualWidget *self)
 
   gtk_container_remove (GTK_CONTAINER (priv->vbox_individual),
       GTK_WIDGET (priv->individual_grid));
 
   gtk_container_remove (GTK_CONTAINER (priv->vbox_individual),
       GTK_WIDGET (priv->individual_grid));

+
+#ifdef HAVE_LIBCHAMPLAIN
+  if (priv->map_view_embed != NULL)
+    {
+      gtk_container_remove (GTK_CONTAINER (priv->viewport_map),
+          priv->map_view_embed);
+
+      priv->map_view_embed = NULL;
+    }
+#endif
+

   priv->individual_grid = NULL;
 }
 
   priv->individual_grid = NULL;
 }