brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-11-06 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-label.c: Break the references in ::dispose,
	and free the resources in ::finalize.
This commit is contained in:
Emmanuele Bassi 2007-11-06 14:35:22 +00:00
parent 9047f9d2bc
commit b5afa2e6ec
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-11-06 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-label.c: Break the references in ::dispose,
and free the resources in ::finalize.
2007-11-05 Øyvind Kolås <pippin@o-hand.com> 2007-11-05 Øyvind Kolås <pippin@o-hand.com>
* clutter/clutter-container.[ch]: removed find_child_by_id method * clutter/clutter-container.[ch]: removed find_child_by_id method

23
clutter/clutter-label.c
View File

@ -346,19 +346,7 @@ clutter_label_dispose (GObject *object)
g_object_unref (priv->layout); g_object_unref (priv->layout);
priv->layout = NULL; priv->layout = NULL;
} }
if (priv->desc)
{
pango_font_description_free (priv->desc);
priv->desc = NULL;
}
g_free (priv->text);
priv->text = NULL;
g_free (priv->font_name);
priv->font_name = NULL;
if (priv->context) if (priv->context)
{ {
g_object_unref (priv->context); g_object_unref (priv->context);
@ -371,6 +359,17 @@ clutter_label_dispose (GObject *object)
static void static void
clutter_label_finalize (GObject *object) clutter_label_finalize (GObject *object)
{ {
ClutterLabel *self = CLUTTER_LABEL(object);
ClutterLabelPrivate *priv;
priv = self->priv;
if (priv->desc)
pango_font_description_free (priv->desc);
g_free (priv->text);
g_free (priv->font_name);
G_OBJECT_CLASS (clutter_label_parent_class)->finalize (object); G_OBJECT_CLASS (clutter_label_parent_class)->finalize (object);
} }