diff options
author | António Fernandes <antoniof@gnome.org> | 2021-12-17 15:29:46 +0000 |
---|---|---|
committer | António Fernandes <antoniof@gnome.org> | 2021-12-31 10:55:50 +0000 |
commit | 87f6d9ae5b6a872a9639eb8523bdd29e9f224e2a (patch) | |
tree | 803487a2fe68ee86c20b8031403fd7a6352702d2 | |
parent | 309247bc9091076f5da92c1b135a9fbe35b2a6f3 (diff) | |
download | nautilus-87f6d9ae5b6a872a9639eb8523bdd29e9f224e2a.tar.gz |
general: Disable clipboard
GTK 4 changes how clipboard is interacted with, compared to GTK 3.
Disable this code before the switch. It shall be reimplemented
once we are building against GTK 4.
-rw-r--r-- | src/nautilus-clipboard.c | 2 | ||||
-rw-r--r-- | src/nautilus-clipboard.h | 2 | ||||
-rw-r--r-- | src/nautilus-files-view.c | 32 | ||||
-rw-r--r-- | src/nautilus-list-view.c | 14 |
4 files changed, 50 insertions, 0 deletions
diff --git a/src/nautilus-clipboard.c b/src/nautilus-clipboard.c index 02bf05497..8dee3e6dc 100644 --- a/src/nautilus-clipboard.c +++ b/src/nautilus-clipboard.c @@ -24,6 +24,7 @@ * Darin Adler <darin@bentspoon.com> */ +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION #include <config.h> #include "nautilus-clipboard.h" #include "nautilus-file-utilities.h" @@ -327,3 +328,4 @@ nautilus_clipboard_get_atom (void) return copied_files_atom; } +#endif diff --git a/src/nautilus-clipboard.h b/src/nautilus-clipboard.h index 1dd26d7c2..c46bcabaf 100644 --- a/src/nautilus-clipboard.h +++ b/src/nautilus-clipboard.h @@ -21,6 +21,7 @@ */ #pragma once +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION #include <gtk/gtk.h> @@ -33,3 +34,4 @@ void nautilus_clipboard_prepare_for_files (GtkClipboard *clipboard, GList *files, gboolean cut); GdkAtom nautilus_clipboard_get_atom (void); +#endif diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index cf71deccf..b464748c8 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -319,9 +319,11 @@ static void trash_or_delete_files (GtkWindow *parent_window, NautilusFilesView *view); static void load_directory (NautilusFilesView *view, NautilusDirectory *directory); +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION static void on_clipboard_owner_changed (GtkClipboard *clipboard, GdkEvent *event, gpointer user_data); +#endif static void schedule_update_context_menus (NautilusFilesView *view); static void remove_update_context_menus_timeout_callback (NautilusFilesView *view); static void schedule_update_status (NautilusFilesView *view); @@ -2606,6 +2608,7 @@ action_open_item_new_window (GSimpleAction *action, nautilus_file_list_free (selection); } +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION static void handle_clipboard_data (NautilusFilesView *view, GtkSelectionData *selection_data, @@ -2673,10 +2676,12 @@ paste_clipboard_received_callback (GtkClipboard *clipboard, g_object_unref (view); } +#endif static void paste_files (NautilusFilesView *view) { +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION GtkClipboard *clipboard; clipboard = nautilus_clipboard_get (GTK_WIDGET (view)); @@ -2689,6 +2694,7 @@ paste_files (NautilusFilesView *view) nautilus_clipboard_get_atom (), paste_clipboard_received_callback, view); +#endif } static void @@ -2725,6 +2731,7 @@ action_paste_files_accel (GSimpleAction *action, } } +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION static void create_links_clipboard_received_callback (GtkClipboard *clipboard, GtkSelectionData *selection_data, @@ -2748,12 +2755,14 @@ create_links_clipboard_received_callback (GtkClipboard *clipboard, g_object_unref (view); } +#endif static void action_create_links (GSimpleAction *action, GVariant *state, gpointer user_data) { +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION NautilusFilesView *view; g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); @@ -2765,6 +2774,7 @@ action_create_links (GSimpleAction *action, nautilus_clipboard_get_atom (), create_links_clipboard_received_callback, view); +#endif } static void @@ -3171,7 +3181,9 @@ nautilus_files_view_dispose (GObject *object) { NautilusFilesView *view; NautilusFilesViewPrivate *priv; +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION GtkClipboard *clipboard; +#endif GList *node, *next; view = NAUTILUS_FILES_VIEW (object); @@ -3252,8 +3264,10 @@ nautilus_files_view_dispose (GObject *object) g_signal_handlers_disconnect_by_func (nautilus_trash_monitor_get (), nautilus_files_view_trash_state_changed_callback, view); +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); g_signal_handlers_disconnect_by_func (clipboard, on_clipboard_owner_changed, view); +#endif nautilus_file_unref (priv->directory_as_file); priv->directory_as_file = NULL; @@ -5937,6 +5951,7 @@ action_copy (GSimpleAction *action, GVariant *state, gpointer user_data) { +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION NautilusFilesView *view; GtkClipboard *clipboard; GList *selection; @@ -5948,6 +5963,7 @@ action_copy (GSimpleAction *action, nautilus_clipboard_prepare_for_files (clipboard, selection, FALSE); nautilus_file_list_free (selection); +#endif } static void @@ -5955,6 +5971,7 @@ action_cut (GSimpleAction *action, GVariant *state, gpointer user_data) { +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION NautilusFilesView *view; GList *selection; GtkClipboard *clipboard; @@ -5966,6 +5983,7 @@ action_cut (GSimpleAction *action, nautilus_clipboard_prepare_for_files (clipboard, selection, TRUE); nautilus_file_list_free (selection); +#endif } static void @@ -6021,6 +6039,7 @@ action_move_to (GSimpleAction *action, copy_or_move_selection (view, TRUE); } +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION typedef struct { NautilusFilesView *view; @@ -6075,12 +6094,14 @@ paste_into (NautilusFilesView *view, paste_into_clipboard_received_callback, data); } +#endif static void action_paste_files_into (GSimpleAction *action, GVariant *state, gpointer user_data) { +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION NautilusFilesView *view; g_autolist (NautilusFile) selection = NULL; @@ -6090,6 +6111,7 @@ action_paste_files_into (GSimpleAction *action, { paste_into (view, NAUTILUS_FILE (selection->data)); } +#endif } static void @@ -7096,6 +7118,7 @@ can_paste_into_file (NautilusFile *file) return FALSE; } +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION static void on_clipboard_contents_received (GtkClipboard *clipboard, GtkSelectionData *selection_data, @@ -7195,6 +7218,7 @@ on_clipboard_targets_received (GtkClipboard *clipboard, g_object_unref (view); } +#endif static void file_should_show_foreach (NautilusFile *file, @@ -7295,6 +7319,7 @@ can_restore_from_trash (GList *files) return can_restore; } +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION static void on_clipboard_owner_changed (GtkClipboard *clipboard, GdkEvent *event, @@ -7305,6 +7330,7 @@ on_clipboard_owner_changed (GtkClipboard *clipboard, /* Update paste menu item */ nautilus_files_view_update_context_menus (self); } +#endif static gboolean can_delete_all (GList *files) @@ -7749,6 +7775,7 @@ real_update_actions_state (NautilusFilesView *view) !selection_contains_starred && priv->templates_menu != NULL); +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION /* Actions that are related to the clipboard need request, request the data * and update them once we have the data */ g_object_ref (view); /* Need to keep the object alive until we get the reply */ @@ -7761,6 +7788,7 @@ real_update_actions_state (NautilusFilesView *view) nautilus_clipboard_get_atom (), on_clipboard_contents_received, view); +#endif action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), "select-all"); @@ -9585,7 +9613,9 @@ nautilus_files_view_init (NautilusFilesView *view) NautilusDirectory *scripts_directory; NautilusDirectory *templates_directory; gchar *templates_uri; +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION GtkClipboard *clipboard; +#endif GApplication *app; const gchar *open_accels[] = { @@ -9783,10 +9813,12 @@ nautilus_files_view_init (NautilusFilesView *view) g_signal_connect_object (nautilus_trash_monitor_get (), "trash-state-changed", G_CALLBACK (nautilus_files_view_trash_state_changed_callback), view, 0); +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION /* React to clipboard changes */ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); g_signal_connect (clipboard, "owner-change", G_CALLBACK (on_clipboard_owner_changed), view); +#endif /* Register to menu provider extension signal managing menu updates */ g_signal_connect_object (nautilus_signaller_get_current (), "popup-menu-changed", diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c index 00b9f1adb..68252586c 100644 --- a/src/nautilus-list-view.c +++ b/src/nautilus-list-view.c @@ -97,9 +97,11 @@ static char **get_visible_columns (NautilusListView *list_view); static char **get_default_visible_columns (NautilusListView *list_view); static char **get_column_order (NautilusListView *list_view); static char **get_default_column_order (NautilusListView *list_view); +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION static void on_clipboard_owner_changed (GtkClipboard *clipboard, GdkEvent *event, gpointer user_data); +#endif static void popup_column_header_menu (NautilusListView *list_view, gdouble x, gdouble y); @@ -3541,7 +3543,9 @@ static void nautilus_list_view_dispose (GObject *object) { NautilusListView *list_view; +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION GtkClipboard *clipboard; +#endif list_view = NAUTILUS_LIST_VIEW (object); @@ -3559,8 +3563,10 @@ nautilus_list_view_dispose (GObject *object) } #endif +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); g_signal_handlers_disconnect_by_func (clipboard, on_clipboard_owner_changed, list_view); +#endif g_signal_handlers_disconnect_by_func (nautilus_preferences, default_sort_order_changed_callback, list_view); @@ -3705,6 +3711,7 @@ list_view_scroll_to_file (NautilusFilesView *view, } } +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION static void on_clipboard_contents_received (GtkClipboard *clipboard, GtkSelectionData *selection_data, @@ -3756,12 +3763,15 @@ on_clipboard_owner_changed (GtkClipboard *clipboard, { update_clipboard_status (NAUTILUS_LIST_VIEW (user_data)); } +#endif static void nautilus_list_view_end_loading (NautilusFilesView *view, gboolean all_files_seen) { +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION update_clipboard_status (NAUTILUS_LIST_VIEW (view)); +#endif } static guint @@ -3983,7 +3993,9 @@ static void nautilus_list_view_init (NautilusListView *list_view) { GActionGroup *view_action_group; +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION GtkClipboard *clipboard; +#endif list_view->details = g_new0 (NautilusListViewDetails, 1); @@ -4012,10 +4024,12 @@ nautilus_list_view_init (NautilusListView *list_view) G_CALLBACK (default_column_order_changed_callback), list_view); +#if 0 && NAUTILUS_CLIPBOARD_NEEDS_GTK4_REIMPLEMENTATION /* React to clipboard changes */ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); g_signal_connect (clipboard, "owner-change", G_CALLBACK (on_clipboard_owner_changed), list_view); +#endif nautilus_list_view_click_policy_changed (NAUTILUS_FILES_VIEW (list_view)); |