From 3712762752995bca3c88ed9469310c6c4ab75f59 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 11 Oct 2011 18:25:53 -0400 Subject: 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 file changed, 11 insertions(+) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index 5a1c559d1..cba278477 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; } -- cgit v1.2.3