[libchamplain] Fix view destruction upon shutdown.
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libchamplain] Fix view destruction upon shutdown.
- Date: Tue, 16 Feb 2010 21:28:48 +0000 (UTC)
commit 10f977db44dab93e2a89f32d5081fddb21a08b23
Author: JiÅ?Ã Techet <techet gmail com>
Date: Sat Jan 30 20:42:43 2010 +0100
Fix view destruction upon shutdown.
View (and indirectly map sources) were not destroyed because
gtk_champlain_embed
* didn't chain dispose
Also the view has to be destroyed manually when inserted into stage
obtained from clutter_stage_get_default() - it appears that it isn't
destroyed upon application shutdown.
Signed-off-by: JiÅ?Ã Techet <techet gmail com>
champlain-gtk/gtk-champlain-embed.c | 2 ++
demos/animated-marker.c | 1 +
demos/launcher.c | 1 +
demos/polygons.c | 1 +
demos/url-marker.c | 1 +
5 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/champlain-gtk/gtk-champlain-embed.c b/champlain-gtk/gtk-champlain-embed.c
index 5e22f4a..431eda6 100644
--- a/champlain-gtk/gtk-champlain-embed.c
+++ b/champlain-gtk/gtk-champlain-embed.c
@@ -145,6 +145,8 @@ gtk_champlain_embed_dispose (GObject *object)
gdk_cursor_unref (priv->cursor_hand_closed);
priv->cursor_hand_closed = NULL;
}
+
+ G_OBJECT_CLASS (gtk_champlain_embed_parent_class)->dispose (object);
}
static void
diff --git a/demos/animated-marker.c b/demos/animated-marker.c
index ed44228..c241a14 100644
--- a/demos/animated-marker.c
+++ b/demos/animated-marker.c
@@ -133,5 +133,6 @@ main (int argc, char *argv[])
clutter_actor_show (stage);
clutter_main ();
+ clutter_actor_destroy (actor);
return 0;
}
diff --git a/demos/launcher.c b/demos/launcher.c
index 35879ff..850d067 100644
--- a/demos/launcher.c
+++ b/demos/launcher.c
@@ -143,5 +143,6 @@ main (int argc,
clutter_actor_show (stage);
clutter_main ();
+ clutter_actor_destroy (actor);
return 0;
}
diff --git a/demos/polygons.c b/demos/polygons.c
index acd944b..4726e58 100644
--- a/demos/polygons.c
+++ b/demos/polygons.c
@@ -143,5 +143,6 @@ main (int argc,
clutter_actor_show (stage);
clutter_main ();
+ clutter_actor_destroy (actor);
return 0;
}
diff --git a/demos/url-marker.c b/demos/url-marker.c
index 2b13f2b..530a185 100644
--- a/demos/url-marker.c
+++ b/demos/url-marker.c
@@ -270,5 +270,6 @@ main (int argc, char *argv[])
g_object_unref (session);
+ clutter_actor_destroy (view);
return 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]