diff options
| author | Ernestas Kulik <ernestask@gnome.org> | 2017-12-12 16:56:29 +0200 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@gnome.org> | 2018-01-02 12:51:32 +0200 |
| commit | 74dd9c9f72002d482c898a704bb5b95655e35e08 (patch) | |
| tree | 0472fecf3b99f1669be99fe18f343d0a47eea535 /src/nautilus-tree-view-drag-dest.c | |
| parent | 816b8247f3147637d13b55446ee38d4470c0f225 (diff) | |
| download | nautilus-74dd9c9f72002d482c898a704bb5b95655e35e08.tar.gz | |
general: remove desktop support
Diffstat (limited to 'src/nautilus-tree-view-drag-dest.c')
| -rw-r--r-- | src/nautilus-tree-view-drag-dest.c | 46 |
1 files changed, 13 insertions, 33 deletions
diff --git a/src/nautilus-tree-view-drag-dest.c b/src/nautilus-tree-view-drag-dest.c index 42868e3bd..7a15d7170 100644 --- a/src/nautilus-tree-view-drag-dest.c +++ b/src/nautilus-tree-view-drag-dest.c @@ -752,17 +752,8 @@ receive_uris (NautilusTreeViewDragDest *dest, if (real_action == GDK_ACTION_ASK) { - if (nautilus_drag_selection_includes_special_link (dest->details->drag_list)) - { - /* We only want to move the trash */ - action = GDK_ACTION_MOVE; - } - else - { - action = GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK; - } - real_action = nautilus_drag_drop_action_ask - (GTK_WIDGET (dest->details->tree_view), action); + action = GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK; + real_action = nautilus_drag_drop_action_ask (GTK_WIDGET (dest->details->tree_view), action); } /* We only want to copy external uris */ @@ -890,8 +881,7 @@ receive_dropped_raw (NautilusTreeViewDragDest *dest, g_signal_emit (dest, signals[HANDLE_RAW], 0, raw_data, length, drop_target, dest->details->direct_save_uri, - gdk_drag_context_get_selected_action (context), - x, y); + gdk_drag_context_get_selected_action (context)); g_free (drop_target); } @@ -1275,12 +1265,10 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class) NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 5, + G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_STRING, - GDK_TYPE_DRAG_ACTION, - G_TYPE_INT, - G_TYPE_INT); + GDK_TYPE_DRAG_ACTION); signals[HANDLE_NETSCAPE_URL] = g_signal_new ("handle-netscape-url", G_TYPE_FROM_CLASS (class), @@ -1289,12 +1277,10 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class) handle_netscape_url), NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 5, + G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, - GDK_TYPE_DRAG_ACTION, - G_TYPE_INT, - G_TYPE_INT); + GDK_TYPE_DRAG_ACTION); signals[HANDLE_URI_LIST] = g_signal_new ("handle-uri-list", G_TYPE_FROM_CLASS (class), @@ -1303,12 +1289,10 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class) handle_uri_list), NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 5, + G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, - GDK_TYPE_DRAG_ACTION, - G_TYPE_INT, - G_TYPE_INT); + GDK_TYPE_DRAG_ACTION); signals[HANDLE_TEXT] = g_signal_new ("handle-text", G_TYPE_FROM_CLASS (class), @@ -1317,12 +1301,10 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class) handle_text), NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 5, + G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, - GDK_TYPE_DRAG_ACTION, - G_TYPE_INT, - G_TYPE_INT); + GDK_TYPE_DRAG_ACTION); signals[HANDLE_RAW] = g_signal_new ("handle-raw", G_TYPE_FROM_CLASS (class), @@ -1331,14 +1313,12 @@ nautilus_tree_view_drag_dest_class_init (NautilusTreeViewDragDestClass *class) handle_raw), NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 7, + G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, - GDK_TYPE_DRAG_ACTION, - G_TYPE_INT, - G_TYPE_INT); + GDK_TYPE_DRAG_ACTION); signals[HANDLE_HOVER] = g_signal_new ("handle-hover", G_TYPE_FROM_CLASS (class), |