diff options
| author | ZenWalker <[email protected]> | 2017-07-16 04:56:55 +0200 |
|---|---|---|
| committer | ZenWalker <[email protected]> | 2017-07-16 04:56:55 +0200 |
| commit | 93a5e46e96a251b7574859bc1cd211fdbde01c3d (patch) | |
| tree | 7bef2fd6e07d146879e5e68438023b2b3f547014 /libcaja-private | |
| parent | a36653c9b55d879cf8b22cbd2776db4d5c8f0d88 (diff) | |
| download | caja-93a5e46e96a251b7574859bc1cd211fdbde01c3d.tar.bz2 caja-93a5e46e96a251b7574859bc1cd211fdbde01c3d.tar.xz | |
avoid deprecated gdk_screen_get_number
Diffstat (limited to 'libcaja-private')
| -rw-r--r-- | libcaja-private/caja-file-operations.c | 3 | ||||
| -rw-r--r-- | libcaja-private/caja-icon-dnd.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c index 0e6a7f64..cb3ba2ba 100644 --- a/libcaja-private/caja-file-operations.c +++ b/libcaja-private/caja-file-operations.c @@ -52,6 +52,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> #include <gdk/gdk.h> +#include <gdk/gdkx.h> #include <gtk/gtk.h> #include <gio/gio.h> #include <glib.h> @@ -965,7 +966,7 @@ init_common (gsize job_size, common->screen_num = 0; if (parent_window) { screen = gtk_widget_get_screen (GTK_WIDGET (parent_window)); - common->screen_num = gdk_screen_get_number (screen); + common->screen_num = gdk_x11_screen_get_screen_number (screen); } return common; diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c index ad5249b5..9ea34a03 100644 --- a/libcaja-private/caja-icon-dnd.c +++ b/libcaja-private/caja-icon-dnd.c @@ -980,7 +980,7 @@ handle_local_move (CajaIconContainer *container, screen = gtk_widget_get_screen (GTK_WIDGET (container)); g_snprintf (screen_string, sizeof (screen_string), "%d", - gdk_screen_get_number (screen)); + gdk_x11_screen_get_screen_number (screen)); caja_file_set_metadata (file, CAJA_METADATA_KEY_SCREEN, NULL, screen_string); @@ -1545,7 +1545,7 @@ caja_icon_dnd_begin_drag (CajaIconContainer *container, dnd_info->drag_info.start_x = start_x - gtk_adjustment_get_value (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container))); dnd_info->drag_info.start_y = start_y - - gtk_adjustment_get_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container))); + gtk_adjustment_get_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container))); /* start the drag */ gtk_drag_begin_with_coordinates (GTK_WIDGET (container), @@ -1907,7 +1907,7 @@ drag_data_received_callback (GtkWidget *widget, caja_file_changes_queue_schedule_position_set ( location, p, - gdk_screen_get_number ( + gdk_x11_screen_get_screen_number ( gtk_widget_get_screen (widget))); g_object_unref (location); caja_file_changes_consume_changes (TRUE); |