AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-30 11:07:38 +00:00
Code Issues Projects Releases Wiki Activity

iconhelper: Use g_clear_* helpers

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=709264
This commit is contained in:
Bastien Nocera 2013-10-02 15:06:36 +02:00
parent 8938f3c47d
commit e53bb1bf1b
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkiconhelper.c
View File

@ -62,18 +62,8 @@ _gtk_icon_helper_clear (GtkIconHelper *self)
g_clear_object (&self->priv->animation); g_clear_object (&self->priv->animation);
g_clear_object (&self->priv->rendered_pixbuf); g_clear_object (&self->priv->rendered_pixbuf);
g_clear_object (&self->priv->window); g_clear_object (&self->priv->window);
g_clear_pointer (&self->priv->orig_surface, cairo_surface_destroy);
if (self->priv->orig_surface) g_clear_pointer (&self->priv->rendered_surface, cairo_surface_destroy);
{
cairo_surface_destroy (self->priv->orig_surface);
self->priv->orig_surface = NULL;
}
if (self->priv->rendered_surface)
{
cairo_surface_destroy (self->priv->rendered_surface);
self->priv->rendered_surface = NULL;
}
if (self->priv->icon_set != NULL) if (self->priv->icon_set != NULL)
{ {
@ -83,11 +73,8 @@ _gtk_icon_helper_clear (GtkIconHelper *self)
self->priv->icon_set = NULL; self->priv->icon_set = NULL;
} }
g_free (self->priv->icon_name); g_clear_pointer (&self->priv->icon_name, g_free);
self->priv->icon_name = NULL; g_clear_pointer (&self->priv->stock_id, g_free);
g_free (self->priv->stock_id);
self->priv->stock_id = NULL;
self->priv->storage_type = GTK_IMAGE_EMPTY; self->priv->storage_type = GTK_IMAGE_EMPTY;
self->priv->icon_size = GTK_ICON_SIZE_INVALID; self->priv->icon_size = GTK_ICON_SIZE_INVALID;