dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace gdk_cursor_unref() with g_object_unref()

This commit is contained in:
Michael Natterer 2010-12-29 15:30:20 +01:00
parent 8c975484ab
commit ce2cd374ee
15 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/widgets/gimpcursor.c
View File

@ -424,7 +424,7 @@ gimp_cursor_set (GtkWidget *widget,
tool_cursor, tool_cursor,
modifier); modifier);
gdk_window_set_cursor (gtk_widget_get_window (widget), cursor); gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
gdk_display_flush (gtk_widget_get_display (widget)); gdk_display_flush (gtk_widget_get_display (widget));
} }

2
app/widgets/gimpcurveview.c
View File

@ -755,7 +755,7 @@ set_cursor (GimpCurveView *view,
GdkCursor *cursor = gdk_cursor_new_for_display (display, new_cursor); GdkCursor *cursor = gdk_cursor_new_for_display (display, new_cursor);
gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (view)), cursor); gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (view)), cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
view->cursor_type = new_cursor; view->cursor_type = new_cursor;
} }

4
app/widgets/gimpdialogfactory.c
View File

@ -1565,7 +1565,7 @@ gimp_dialog_factory_set_busy (GimpDialogFactory *factory)
display = gtk_widget_get_display (widget); display = gtk_widget_get_display (widget);
if (cursor) if (cursor)
gdk_cursor_unref (cursor); g_object_unref (cursor);
cursor = gimp_cursor_new (display, cursor = gimp_cursor_new (display,
GIMP_HANDEDNESS_RIGHT, GIMP_HANDEDNESS_RIGHT,
@ -1580,7 +1580,7 @@ gimp_dialog_factory_set_busy (GimpDialogFactory *factory)
} }
if (cursor) if (cursor)
gdk_cursor_unref (cursor); g_object_unref (cursor);
} }
void void

6
app/widgets/gimpnavigationview.c
View File

@ -232,7 +232,7 @@ gimp_navigation_view_grab_pointer (GimpNavigationView *nav_view)
GDK_EXTENSION_EVENTS_ALL, GDK_EXTENSION_EVENTS_ALL,
NULL, cursor, GDK_CURRENT_TIME); NULL, cursor, GDK_CURRENT_TIME);
gdk_cursor_unref (cursor); g_object_unref (cursor);
} }
static gboolean static gboolean
@ -260,7 +260,7 @@ gimp_navigation_view_button_press (GtkWidget *widget,
display = gtk_widget_get_display (widget); display = gtk_widget_get_display (widget);
cursor = gdk_cursor_new_for_display (display, GDK_FLEUR); cursor = gdk_cursor_new_for_display (display, GDK_FLEUR);
gdk_window_set_cursor (GIMP_VIEW (widget)->event_window, cursor); gdk_window_set_cursor (GIMP_VIEW (widget)->event_window, cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
} }
else else
{ {
@ -362,7 +362,7 @@ gimp_navigation_view_motion_notify (GtkWidget *widget,
} }
gdk_window_set_cursor (view->event_window, cursor); gdk_window_set_cursor (view->event_window, cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
return FALSE; return FALSE;
} }

2
app/widgets/gimpoverlaychild.c
View File

@ -185,7 +185,7 @@ gimp_overlay_child_realize (GimpOverlayBox *box,
gdk_offscreen_window_set_embedder (child->window, gdk_offscreen_window_set_embedder (child->window,
gtk_widget_get_window (widget)); gtk_widget_get_window (widget));
gdk_cursor_unref (attributes.cursor); g_object_unref (attributes.cursor);
g_signal_connect (child->window, "from-embedder", g_signal_connect (child->window, "from-embedder",
G_CALLBACK (gimp_overlay_child_from_embedder), G_CALLBACK (gimp_overlay_child_from_embedder),

2
plug-ins/common/animation-play.c
View File

@ -964,7 +964,7 @@ build_dialog (gchar *imagename)
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (shape_window), cursor = gdk_cursor_new_for_display (gtk_widget_get_display (shape_window),
GDK_HAND2); GDK_HAND2);
gdk_window_set_cursor (gtk_widget_get_window (shape_window), cursor); gdk_window_set_cursor (gtk_widget_get_window (shape_window), cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
g_signal_connect(shape_drawing_area, "size-allocate", g_signal_connect(shape_drawing_area, "size-allocate",
G_CALLBACK(sda_size_callback), G_CALLBACK(sda_size_callback),

2
plug-ins/gradient-flare/gradient-flare.c
View File

@ -2542,7 +2542,7 @@ dlg_preview_realize (GtkWidget *widget)
GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR); GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
gdk_window_set_cursor (gtk_widget_get_window (widget), cursor); gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
} }
static gboolean static gboolean

2
plug-ins/help-browser/dialog.c
View File

@ -1038,7 +1038,7 @@ view_unrealize (GtkWidget *widget)
{ {
if (busy_cursor) if (busy_cursor)
{ {
gdk_cursor_unref (busy_cursor); g_object_unref (busy_cursor);
busy_cursor = NULL; busy_cursor = NULL;
} }
} }

2
plug-ins/ifs-compose/ifs-compose.c
View File

@ -1469,7 +1469,7 @@ design_area_realize (GtkWidget *widget)
GdkCursor *cursor = gdk_cursor_new_for_display (display, GdkCursor *cursor = gdk_cursor_new_for_display (display,
cursors[ifsDesign->op]); cursors[ifsDesign->op]);
gdk_window_set_cursor (gtk_widget_get_window (widget), cursor); gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
} }
static gboolean static gboolean

2
plug-ins/imagemap/imap_preview.c
View File

@ -371,7 +371,7 @@ preview_set_cursor(Preview_t *preview, GdkCursorType cursor_type)
cursor_type); cursor_type);
gdk_window_set_cursor(gtk_widget_get_window (preview->window), cursor); gdk_window_set_cursor(gtk_widget_get_window (preview->window), cursor);
gdk_cursor_unref(cursor); g_object_unref (cursor);
preview->cursor = cursor_type; preview->cursor = cursor_type;

4
plug-ins/lighting/lighting-preview.c
View File

@ -388,12 +388,12 @@ preview_compute (void)
cursor = gdk_cursor_new_for_display (display, GDK_WATCH); cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor); gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
compute_preview (startx, starty, pw, ph); compute_preview (startx, starty, pw, ph);
cursor = gdk_cursor_new_for_display (display, GDK_HAND2); cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor); gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
gdk_flush (); gdk_flush ();
} }

2
plug-ins/lighting/lighting-ui.c
View File

@ -1125,7 +1125,7 @@ main_dialog (GimpDrawable *drawable)
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (previewarea), cursor = gdk_cursor_new_for_display (gtk_widget_get_display (previewarea),
GDK_HAND2); GDK_HAND2);
gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor); gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
} }
if (image_setup (drawable, TRUE)) if (image_setup (drawable, TRUE))

7
plug-ins/map-object/map-object-preview.c
View File

@ -292,13 +292,13 @@ compute_preview_image (void)
cursor = gdk_cursor_new_for_display (display, GDK_WATCH); cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor); gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
compute_preview (0, 0, width - 1, height - 1, pw, ph); compute_preview (0, 0, width - 1, height - 1, pw, ph);
cursor = gdk_cursor_new_for_display (display, GDK_HAND2); cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
gdk_window_set_cursor(gtk_widget_get_window (previewarea), cursor); gdk_window_set_cursor(gtk_widget_get_window (previewarea), cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
} }
gboolean gboolean
@ -315,6 +315,9 @@ preview_expose (GtkWidget *widget,
startx = (PREVIEW_WIDTH - pw) / 2; startx = (PREVIEW_WIDTH - pw) / 2;
starty = (PREVIEW_HEIGHT - ph) / 2; starty = (PREVIEW_HEIGHT - ph) / 2;
if (pw != PREVIEW_WIDTH || ph != PREVIEW_HEIGHT)
gdk_window_clear (gtk_widget_get_window (previewarea));
cairo_set_source_surface (cr, preview_surface, startx, starty); cairo_set_source_surface (cr, preview_surface, startx, starty);
cairo_rectangle (cr, startx, starty, pw, ph); cairo_rectangle (cr, startx, starty, pw, ph);
cairo_clip (cr); cairo_clip (cr);

2
plug-ins/map-object/map-object-ui.c
View File

@ -1438,7 +1438,7 @@ main_dialog (GimpDrawable *drawable)
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (previewarea), cursor = gdk_cursor_new_for_display (gtk_widget_get_display (previewarea),
GDK_HAND2); GDK_HAND2);
gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor); gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
gdk_cursor_unref (cursor); g_object_unref (cursor);
} }
image_setup (drawable, TRUE); image_setup (drawable, TRUE);

4
plug-ins/print/print-preview.c
View File

@ -245,7 +245,7 @@ print_preview_unrealize (GtkWidget *widget)
PrintPreview *preview = PRINT_PREVIEW (widget); PrintPreview *preview = PRINT_PREVIEW (widget);
if (preview->cursor) if (preview->cursor)
gdk_cursor_unref (preview->cursor); g_object_unref (preview->cursor);
GTK_WIDGET_CLASS (print_preview_parent_class)->unrealize (widget); GTK_WIDGET_CLASS (print_preview_parent_class)->unrealize (widget);
} }
@ -347,7 +347,7 @@ print_preview_button_press_event (GtkWidget *widget,
preview->dragging = TRUE; preview->dragging = TRUE;
} }
gdk_cursor_unref (cursor); g_object_unref (cursor);
} }
return FALSE; return FALSE;