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

Use g_clear_object() instead of unref() + NULL

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-03-20 11:22:07 +00:00
parent 227c7b404d
commit 552a949695
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clutter/clutter-actor.c
View File

@ -3180,8 +3180,7 @@ add_or_remove_flatten_effect (ClutterActor *self)
/* Destroy the effect so that it will lose its fbo cache of /* Destroy the effect so that it will lose its fbo cache of
the actor */ the actor */
_clutter_actor_remove_effect_internal (self, priv->flatten_effect); _clutter_actor_remove_effect_internal (self, priv->flatten_effect);
g_object_unref (priv->flatten_effect); g_clear_object (&priv->flatten_effect);
priv->flatten_effect = NULL;
} }
} }
} }
@ -15907,7 +15906,7 @@ clutter_actor_set_layout_manager (ClutterActor *self,
G_CALLBACK (on_layout_manager_changed), G_CALLBACK (on_layout_manager_changed),
self); self);
clutter_layout_manager_set_container (priv->layout_manager, NULL); clutter_layout_manager_set_container (priv->layout_manager, NULL);
g_object_unref (priv->layout_manager); g_clear_object (&priv->layout_manager);
} }
priv->layout_manager = manager; priv->layout_manager = manager;
@ -17599,7 +17598,7 @@ clutter_actor_set_content (ClutterActor *self,
if (priv->content != NULL) if (priv->content != NULL)
{ {
_clutter_content_detached (priv->content, self); _clutter_content_detached (priv->content, self);
g_object_unref (priv->content); g_clear_object (&priv->content);
} }
priv->content = content; priv->content = content;