AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-04 09:40:19 +00:00
Code Issues Projects Releases Wiki Activity

Small cleanup

Browse Source 
Use g_clear_object in gtkdnd.c.
This commit is contained in:
Matthias Clasen 2015-10-08 07:20:26 -04:00
parent d3475f7a72
commit 1e51398e9a
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gtk/gtkdnd.c
View File

@ -848,18 +848,14 @@ gtk_drag_get_cursor (GtkWidget *widget,
gint i; gint i;
/* reconstruct the cursors for each new drag (thus !info), /* reconstruct the cursors for each new drag (thus !info),
* to catch cursor theme changes * to catch cursor theme changes
*/ */
if (!info) if (!info)
{ {
for (i = 0 ; i < G_N_ELEMENTS (drag_cursors) - 1; i++) for (i = 0 ; i < G_N_ELEMENTS (drag_cursors) - 1; i++)
if (drag_cursors[i].cursor != NULL) g_clear_object (&drag_cursors[i].cursor);
{
g_object_unref (drag_cursors[i].cursor);
drag_cursors[i].cursor = NULL;
}
} }
for (i = 0 ; i < G_N_ELEMENTS (drag_cursors) - 1; i++) for (i = 0 ; i < G_N_ELEMENTS (drag_cursors) - 1; i++)
if (drag_cursors[i].action == action) if (drag_cursors[i].action == action)
break; break;
@ -867,22 +863,19 @@ gtk_drag_get_cursor (GtkWidget *widget,
if (drag_cursors[i].cursor != NULL) if (drag_cursors[i].cursor != NULL)
{ {
if (display != gdk_cursor_get_display (drag_cursors[i].cursor)) if (display != gdk_cursor_get_display (drag_cursors[i].cursor))
{ g_clear_object (&drag_cursors[i].cursor);
g_object_unref (drag_cursors[i].cursor);
drag_cursors[i].cursor = NULL;
}
} }
if (drag_cursors[i].cursor == NULL) if (drag_cursors[i].cursor == NULL)
drag_cursors[i].cursor = gdk_cursor_new_from_name (display, drag_cursors[i].name); drag_cursors[i].cursor = gdk_cursor_new_from_name (display, drag_cursors[i].name);
if (drag_cursors[i].cursor == NULL) if (drag_cursors[i].cursor == NULL)
{ {
ensure_drag_cursor_pixbuf (i); ensure_drag_cursor_pixbuf (i);
drag_cursors[i].cursor = gdk_cursor_new_from_pixbuf (display, drag_cursors[i].pixbuf, 0, 0); drag_cursors[i].cursor = gdk_cursor_new_from_pixbuf (display, drag_cursors[i].pixbuf, 0, 0);
} }
if (info && info->icon_helper) if (info && info->icon_helper)
{ {
gint cursor_width, cursor_height; gint cursor_width, cursor_height;
gint icon_width, icon_height; gint icon_width, icon_height;
@ -896,9 +889,8 @@ gtk_drag_get_cursor (GtkWidget *widget,
{ {
if (display == gdk_cursor_get_display (info->drag_cursors[i])) if (display == gdk_cursor_get_display (info->drag_cursors[i]))
return info->drag_cursors[i]; return info->drag_cursors[i];
g_object_unref (info->drag_cursors[i]); g_clear_object (&info->drag_cursors[i]);
info->drag_cursors[i] = NULL;
} }
scale = gtk_widget_get_scale_factor (widget); scale = gtk_widget_get_scale_factor (widget);
@ -921,7 +913,7 @@ gtk_drag_get_cursor (GtkWidget *widget,
} }
get_surface_size (cursor_surface, &cursor_width, &cursor_height); get_surface_size (cursor_surface, &cursor_width, &cursor_height);
ref_x = MAX (hot_x, icon_x); ref_x = MAX (hot_x, icon_x);
ref_y = MAX (hot_y, icon_y); ref_y = MAX (hot_y, icon_y);
width = ref_x + MAX (cursor_width - hot_x, icon_width - icon_x); width = ref_x + MAX (cursor_width - hot_x, icon_width - icon_x);
@ -951,19 +943,19 @@ gtk_drag_get_cursor (GtkWidget *widget,
cairo_destroy (cr); cairo_destroy (cr);
info->drag_cursors[i] = info->drag_cursors[i] =
gdk_cursor_new_from_surface (display, surface, ref_x, ref_y); gdk_cursor_new_from_surface (display, surface, ref_x, ref_y);
cairo_surface_destroy (surface); cairo_surface_destroy (surface);
} }
cairo_surface_destroy (cursor_surface); cairo_surface_destroy (cursor_surface);
cairo_surface_destroy (icon_surface); cairo_surface_destroy (icon_surface);
if (info->drag_cursors[i] != NULL) if (info->drag_cursors[i] != NULL)
return info->drag_cursors[i]; return info->drag_cursors[i];
} }
return drag_cursors[i].cursor; return drag_cursors[i].cursor;
} }