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 | |
| parent | a36653c9b55d879cf8b22cbd2776db4d5c8f0d88 (diff) | |
| download | caja-93a5e46e96a251b7574859bc1cd211fdbde01c3d.tar.bz2 caja-93a5e46e96a251b7574859bc1cd211fdbde01c3d.tar.xz | |
avoid deprecated gdk_screen_get_number
| -rw-r--r-- | cut-n-paste-code/libegg/eggdesktopfile.c | 2 | ||||
| -rw-r--r-- | libcaja-private/caja-file-operations.c | 3 | ||||
| -rw-r--r-- | libcaja-private/caja-icon-dnd.c | 6 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 11 |
4 files changed, 12 insertions, 10 deletions
diff --git a/cut-n-paste-code/libegg/eggdesktopfile.c b/cut-n-paste-code/libegg/eggdesktopfile.c index 7afb6a2f..011b7fd2 100644 --- a/cut-n-paste-code/libegg/eggdesktopfile.c +++ b/cut-n-paste-code/libegg/eggdesktopfile.c @@ -1187,7 +1187,7 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, display = gdk_display_get_default (); screen = gdk_display_get_default_screen (display); } - screen_num = gdk_screen_get_number (screen); + screen_num = gdk_x11_screen_get_screen_number (screen); translated_documents = translate_document_list (desktop_file, documents); docs = translated_documents; 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); diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index c37da477..1d8c8b5b 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -48,6 +48,7 @@ #include <eel/eel-string.h> #include <eel/eel-vfs-extensions.h> #include <gdk/gdkkeysyms.h> +#include <gdk/gdkx.h> #include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gstdio.h> @@ -2050,7 +2051,7 @@ fm_directory_view_init (FMDirectoryView *view) G_CALLBACK(click_policy_changed_callback), view); g_signal_connect_swapped (caja_preferences, - "changed::" CAJA_PREFERENCES_SORT_DIRECTORIES_FIRST, + "changed::" CAJA_PREFERENCES_SORT_DIRECTORIES_FIRST, G_CALLBACK(sort_directories_first_changed_callback), view); g_signal_connect_swapped (mate_lockdown_preferences, @@ -2753,7 +2754,7 @@ copy_move_done_callback (GHashTable *debuting_files, gpointer data) /* Schedule menu update for undo items */ schedule_update_menus (directory_view); - + } copy_move_done_data_free (copy_move_done_data); @@ -4072,7 +4073,7 @@ new_folder_done (GFile *new_folder, gpointer user_data) } screen = gtk_widget_get_screen (GTK_WIDGET (directory_view)); - g_snprintf (screen_string, sizeof (screen_string), "%d", gdk_screen_get_number (screen)); + g_snprintf (screen_string, sizeof (screen_string), "%d", gdk_x11_screen_get_screen_number (screen)); file = caja_file_get (new_folder); @@ -7374,7 +7375,7 @@ static const GtkActionEntry directory_view_entries[] = { /* label, accelerator */ N_("_Redo"), "<control>Y", /* tooltip */ N_("Redo the last undone action"), G_CALLBACK (action_redo_callback) }, - + /* * multiview-TODO: decide whether "Reset to Defaults" should * be window-wide, and not just view-wide. @@ -10528,7 +10529,7 @@ fm_directory_view_handle_netscape_url_drop (FMDirectoryView *view, point.y = y; screen = gtk_widget_get_screen (GTK_WIDGET (view)); - screen_num = gdk_screen_get_number (screen); + screen_num = gdk_x11_screen_get_screen_number (screen); caja_link_local_create (target_uri != NULL ? target_uri : container_uri, link_name, |