[nautilus] files-view-dnd: Reenable for GTK4



commit c7cf21e1aa38cff617bdbd101a8211ba1b7d6ff7
Author: Corey Berla <corey berla me>
Date:   Thu Jun 16 08:46:50 2022 -0700

    files-view-dnd: Reenable for GTK4
    
    Reuse existing functions where possible.

 src/nautilus-files-view-dnd.c | 9 ++++++---
 src/nautilus-files-view-dnd.h | 3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/nautilus-files-view-dnd.c b/src/nautilus-files-view-dnd.c
index fbb0e2ee7..0f305c832 100644
--- a/src/nautilus-files-view-dnd.c
+++ b/src/nautilus-files-view-dnd.c
@@ -23,7 +23,6 @@
  *          Pavel Cisler <pavel eazel com>
  */
 
-#if 0 && NAUTILUS_DND_NEEDS_GTK4_REIMPLEMENTATION
 #include <config.h>
 
 #include "nautilus-files-view-dnd.h"
@@ -134,10 +133,12 @@ nautilus_files_view_handle_uri_list_drop (NautilusFilesView *view,
 
     if (action == GDK_ACTION_ASK)
     {
+#if 0 && NAUTILUS_DND_NEEDS_GTK4_REIMPLEMENTATION
         action = nautilus_drag_drop_action_ask
                      (GTK_WIDGET (view),
                      GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK);
         if (action == 0)
+#endif
         {
             g_free (container_uri);
             return;
@@ -359,18 +360,21 @@ nautilus_files_view_drop_proxy_received_uris (NautilusFilesView *view,
 
     if (action == GDK_ACTION_ASK)
     {
+#if 0 && NAUTILUS_DND_NEEDS_GTK4_REIMPLEMENTATION
         action = nautilus_drag_drop_action_ask
                      (GTK_WIDGET (view),
                      GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK);
         if (action == 0)
+#endif
         {
             return;
         }
     }
 
+#if 0 && NAUTILUS_DND_NEEDS_GTK4_REIMPLEMENTATION
     nautilus_clipboard_clear_if_colliding_uris (GTK_WIDGET (view),
                                                 source_uri_list);
-
+#endif
     nautilus_files_view_move_copy_items (view, source_uri_list,
                                          target_uri != NULL ? target_uri : container_uri,
                                          action);
@@ -408,4 +412,3 @@ nautilus_files_view_handle_hover (NautilusFilesView *view,
     g_object_unref (location);
     nautilus_file_unref (target_file);
 }
-#endif
diff --git a/src/nautilus-files-view-dnd.h b/src/nautilus-files-view-dnd.h
index 7cfdb53b0..73b9263a7 100644
--- a/src/nautilus-files-view-dnd.h
+++ b/src/nautilus-files-view-dnd.h
@@ -25,7 +25,7 @@
  */
 
 #pragma once
-#if 0 && NAUTILUS_DND_NEEDS_GTK4_REIMPLEMENTATION
+
 #include "nautilus-files-view.h"
 
 void nautilus_files_view_handle_uri_list_drop     (NautilusFilesView *view,
@@ -53,4 +53,3 @@ void nautilus_files_view_drop_proxy_received_uris (NautilusFilesView *view,
                                                    const GList       *uris,
                                                    const char        *target_location,
                                                    GdkDragAction      action);
-#endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]