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

window-actor: Clean up finalization code with simple uses of g_clear_pointer

Browse Source 
While not a massive change by itself, adding new code to use g_clear_pointer
without porting existing usage looks strange.

https://bugzilla.gnome.org/show_bug.cgi?id=679901
This commit is contained in:
Jasper St. Pierre 2013-01-14 21:37:11 -05:00
parent 5d12f00b3b
commit 079dd60e3d
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/compositor/meta-window-actor.c
View File

@ -388,29 +388,10 @@ meta_window_actor_dispose (GObject *object)
meta_window_actor_clear_bounding_region (self); meta_window_actor_clear_bounding_region (self);
meta_window_actor_clear_shadow_clip (self); meta_window_actor_clear_shadow_clip (self);
if (priv->shadow_class != NULL) g_clear_pointer (&priv->shadow_class, g_free);
{ g_clear_pointer (&priv->focused_shadow, meta_shadow_unref);
g_free (priv->shadow_class); g_clear_pointer (&priv->unfocused_shadow, meta_shadow_unref);
priv->shadow_class = NULL; g_clear_pointer (&priv->shadow_shape, meta_window_shape_unref);
}
if (priv->focused_shadow != NULL)
{
meta_shadow_unref (priv->focused_shadow);
priv->focused_shadow = NULL;
}
if (priv->unfocused_shadow != NULL)
{
meta_shadow_unref (priv->unfocused_shadow);
priv->unfocused_shadow = NULL;
}
if (priv->shadow_shape != NULL)
{
meta_window_shape_unref (priv->shadow_shape);
priv->shadow_shape = NULL;
}
if (priv->damage != None) if (priv->damage != None)
{ {
@ -423,17 +404,12 @@ meta_window_actor_dispose (GObject *object)
info->windows = g_list_remove (info->windows, (gconstpointer) self); info->windows = g_list_remove (info->windows, (gconstpointer) self);
if (priv->window) g_clear_object (&priv->window);
{
g_object_unref (priv->window);
priv->window = NULL;
}
/* /*
* Release the extra reference we took on the actor. * Release the extra reference we took on the actor.
*/ */
g_object_unref (priv->actor); g_clear_object (&priv->actor);
priv->actor = NULL;
G_OBJECT_CLASS (meta_window_actor_parent_class)->dispose (object); G_OBJECT_CLASS (meta_window_actor_parent_class)->dispose (object);
} }