[empathy] individual_grid_destroy: remove the ChamplainEmbedView from its container

[Guillaume Desmottes <gdesmott src gnome org>]

commit 3712762752995bca3c88ed9469310c6c4ab75f59
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Oct 11 18:25:53 2011 -0400

    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

 libempathy-gtk/empathy-individual-widget.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 5a1c559..cba2784 100644
--- 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));
+
+#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;
 }