mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-09-30 02:57:38 +00:00
iconhelper: Use g_clear_* helpers
https://bugzilla.gnome.org/show_bug.cgi?id=709264
This commit is contained in:
parent
8938f3c47d
commit
e53bb1bf1b
@ -62,18 +62,8 @@ _gtk_icon_helper_clear (GtkIconHelper *self)
|
||||
g_clear_object (&self->priv->animation);
|
||||
g_clear_object (&self->priv->rendered_pixbuf);
|
||||
g_clear_object (&self->priv->window);
|
||||
|
||||
if (self->priv->orig_surface)
|
||||
{
|
||||
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;
|
||||
}
|
||||
g_clear_pointer (&self->priv->orig_surface, cairo_surface_destroy);
|
||||
g_clear_pointer (&self->priv->rendered_surface, cairo_surface_destroy);
|
||||
|
||||
if (self->priv->icon_set != NULL)
|
||||
{
|
||||
@ -83,11 +73,8 @@ _gtk_icon_helper_clear (GtkIconHelper *self)
|
||||
self->priv->icon_set = NULL;
|
||||
}
|
||||
|
||||
g_free (self->priv->icon_name);
|
||||
self->priv->icon_name = NULL;
|
||||
|
||||
g_free (self->priv->stock_id);
|
||||
self->priv->stock_id = NULL;
|
||||
g_clear_pointer (&self->priv->icon_name, g_free);
|
||||
g_clear_pointer (&self->priv->stock_id, g_free);
|
||||
|
||||
self->priv->storage_type = GTK_IMAGE_EMPTY;
|
||||
self->priv->icon_size = GTK_ICON_SIZE_INVALID;
|
||||
|
Loading…
Reference in New Issue
Block a user