diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-10-12 06:25:53 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-12-22 20:31:04 +0800 |
| commit | 3712762752995bca3c88ed9469310c6c4ab75f59 (patch) | |
| tree | 06db8543fb6974631d7b28c5e0b68c64b5540f28 /libempathy-gtk | |
| parent | 1ea33f5b927b7192a5339be9a377a7b288cd5fee (diff) | |
| download | gsoc2013-empathy-3712762752995bca3c88ed9469310c6c4ab75f59.tar gsoc2013-empathy-3712762752995bca3c88ed9469310c6c4ab75f59.tar.gz gsoc2013-empathy-3712762752995bca3c88ed9469310c6c4ab75f59.tar.bz2 gsoc2013-empathy-3712762752995bca3c88ed9469310c6c4ab75f59.tar.lz gsoc2013-empathy-3712762752995bca3c88ed9469310c6c4ab75f59.tar.xz gsoc2013-empathy-3712762752995bca3c88ed9469310c6c4ab75f59.tar.zst gsoc2013-empathy-3712762752995bca3c88ed9469310c6c4ab75f59.zip | |
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
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | 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 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; } |