diff --git a/ChangeLog b/ChangeLog index 0b1fb1c4d..282fa1713 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-07-30 Ross Burton + + * clutter/clutter-main.c: + Destroy the debugging timer when the context is freed. + + * clutter/clutter-stage.c: + Free the stage title when the stage is finalized. + 2008-07-30 Neil Roberts * clutter/clutter-model.c (clutter_model_set_sorting_column): This diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c index 80ca151ac..54aedbb72 100644 --- a/clutter/clutter-main.c +++ b/clutter/clutter-main.c @@ -408,6 +408,10 @@ clutter_context_free (ClutterMainContext *context) g_object_unref (context->font_map); context->font_map = NULL; +#ifdef CLUTTER_ENABLE_DEBUG + g_timer_destroy (context->timer); +#endif + /* XXX: The cleaning up of the event queue should be moved here from the backend base class. */ diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c index b22b9b373..269c4214b 100644 --- a/clutter/clutter-stage.c +++ b/clutter/clutter-stage.c @@ -478,6 +478,10 @@ clutter_stage_dispose (GObject *object) static void clutter_stage_finalize (GObject *object) { + ClutterStage *stage = CLUTTER_STAGE (object); + + g_free (stage->priv->title); + G_OBJECT_CLASS (clutter_stage_parent_class)->finalize (object); }