From 7d859a9e17f0c4f0b790e8b2a3d8ac25481d7fe6 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 7 Aug 2016 11:10:10 +0200 Subject: avoid deprecated gdk_cursor_new () --- mate-screenshot/src/screenshot-dialog.c | 4 +++- mate-screenshot/src/screenshot-utils.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'mate-screenshot/src') diff --git a/mate-screenshot/src/screenshot-dialog.c b/mate-screenshot/src/screenshot-dialog.c index 6e71ebf8..fd9f12e4 100644 --- a/mate-screenshot/src/screenshot-dialog.c +++ b/mate-screenshot/src/screenshot-dialog.c @@ -408,14 +408,16 @@ screenshot_dialog_set_busy (ScreenshotDialog *dialog, gboolean busy) { GtkWidget *toplevel; + GdkDisplay *display; toplevel = screenshot_dialog_get_toplevel (dialog); + display = gtk_widget_get_display (GTK_WIDGET (dialog)); if (busy) { GdkCursor *cursor; /* Change cursor to busy */ - cursor = gdk_cursor_new (GDK_WATCH); + cursor = gdk_cursor_new_for_display (display, GDK_WATCH); gdk_window_set_cursor (gtk_widget_get_window (toplevel), cursor); #if GTK_CHECK_VERSION (3, 0, 0) g_object_unref (cursor); diff --git a/mate-screenshot/src/screenshot-utils.c b/mate-screenshot/src/screenshot-utils.c index 0efd43b8..f2350184 100644 --- a/mate-screenshot/src/screenshot-utils.c +++ b/mate-screenshot/src/screenshot-utils.c @@ -499,6 +499,7 @@ emit_select_callback_in_idle (gpointer user_data) void screenshot_select_area_async (SelectAreaCallback callback) { + GdkDisplay *display; GdkCursor *cursor; #if GTK_CHECK_VERSION (3, 0, 0) GdkDeviceManager *manager; @@ -524,10 +525,11 @@ screenshot_select_area_async (SelectAreaCallback callback) g_signal_connect (data.window, "button-release-event", G_CALLBACK (select_area_button_release), &data); g_signal_connect (data.window, "motion-notify-event", G_CALLBACK (select_area_motion_notify), &data); - cursor = gdk_cursor_new (GDK_CROSSHAIR); + display = gdk_display_get_default (); + cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR); #if GTK_CHECK_VERSION (3, 0, 0) - manager = gdk_display_get_device_manager (gdk_display_get_default ()); + manager = gdk_display_get_device_manager (display); pointer = gdk_device_manager_get_client_pointer (manager); keyboard = gdk_device_get_associated_device (pointer); -- cgit v1.2.1