diff options
| author | Cosimo Cecchi <cosimo.cecchi@gmail.com> | 2018-09-16 18:57:01 +0000 |
|---|---|---|
| committer | Cosimo Cecchi <cosimo.cecchi@gmail.com> | 2018-09-16 18:57:01 +0000 |
| commit | 5f6d7db4faa8cde99fcccc16a9f15ac4bb3b188f (patch) | |
| tree | c6e6df1567286266074a53d652e65f79cf9c5aba | |
| parent | 8e8a08a33e5036cfc95c1cf87eae72c7775fde73 (diff) | |
| parent | b6d17c508c832d9131c60e85eb50c23a909e85cf (diff) | |
| download | gnome-screenshot-5f6d7db4faa8cde99fcccc16a9f15ac4bb3b188f.tar.gz | |
Merge branch 'fix/cursor_new' into 'master'
Replace deprecated gdk_cursor_new
See merge request GNOME/gnome-screenshot!4
| -rw-r--r-- | src/screenshot-area-selection.c | 6 | ||||
| -rw-r--r-- | src/screenshot-dialog.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/screenshot-area-selection.c b/src/screenshot-area-selection.c index b74aa22..820b88b 100644 --- a/src/screenshot-area-selection.c +++ b/src/screenshot-area-selection.c @@ -226,6 +226,7 @@ emit_select_callback_in_idle (gpointer user_data) static void screenshot_select_area_x11_async (CallbackData *cb_data) { + GdkDisplay *display; GdkCursor *cursor; select_area_filter_data data; GdkDeviceManager *manager; @@ -245,8 +246,9 @@ screenshot_select_area_x11_async (CallbackData *cb_data) 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); - manager = gdk_display_get_device_manager (gdk_display_get_default ()); + display = gtk_widget_get_display (data.window); + cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR); + manager = gdk_display_get_device_manager (display); pointer = gdk_device_manager_get_client_pointer (manager); keyboard = gdk_device_get_associated_device (pointer); diff --git a/src/screenshot-dialog.c b/src/screenshot-dialog.c index 248e5f1..92e035a 100644 --- a/src/screenshot-dialog.c +++ b/src/screenshot-dialog.c @@ -332,9 +332,11 @@ screenshot_dialog_set_busy (ScreenshotDialog *dialog, if (busy) { + GdkDisplay *display; GdkCursor *cursor; /* Change cursor to busy */ - cursor = gdk_cursor_new (GDK_WATCH); + display = gtk_widget_get_window (GTK_WIDGET (dialog)); + cursor = gdk_cursor_new_for_display (display, GDK_WATCH); gdk_window_set_cursor (window, cursor); g_object_unref (cursor); } |