diff options
| author | Christian Neumair <chris@gnome-de.org> | 2005-07-06 12:18:28 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2005-07-06 12:18:28 +0000 |
| commit | e940b87fe590592c0c3da34f7fa23994505bd5a6 (patch) | |
| tree | fb0ff6d2c088d95d43ca1c4b4ef28ffd9f51bfa2 /libnautilus-private/nautilus-tree-view-drag-dest.c | |
| parent | fdecd6e0f6f73b3d19a1be57b9c93646deec982a (diff) | |
| download | nautilus-e940b87fe590592c0c3da34f7fa23994505bd5a6.tar.gz | |
Correctly sort files before operating on them. Fixes #308884.
2005-07-06 Christian Neumair <chris@gnome-de.org>
* libnautilus-private/nautilus-icon-container.c:
(nautilus_icon_container_get_selection):
* src/file-manager/fm-directory-view.c: (delete_selected_files):
Correctly sort files before operating on them. Fixes #308884.
* libnautilus-private/nautilus-dnd.c: (nautilus_drag_init):
* libnautilus-private/nautilus-dnd.h:
* libnautilus-private/nautilus-icon-dnd.c:
(get_data_on_first_target_we_support), (nautilus_icon_dnd_init):
* libnautilus-private/nautilus-tree-view-drag-dest.c:
(nautilus_tree_view_drag_dest_new):
* src/nautilus-spatial-window.c:
(nautilus_spatial_window_instance_init):
* src/file-manager/fm-list-model.c:
(fm_list_model_multi_drag_data_get):
Use GTK+ helpers for text D'n'D.
* src/nautilus-shell-ui.xml:
* src/nautilus-window-menus.c:
Register control-+/- keys on keypad for zooming. Fixes #309018.
* libnautilus-private/nautilus-file-operations.c:
(new_file_transfer_callback):
Fix template duplicate numbering. Fixes #307252.
Diffstat (limited to 'libnautilus-private/nautilus-tree-view-drag-dest.c')
| -rw-r--r-- | libnautilus-private/nautilus-tree-view-drag-dest.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.c b/libnautilus-private/nautilus-tree-view-drag-dest.c index d02200c9e..1a983e8ce 100644 --- a/libnautilus-private/nautilus-tree-view-drag-dest.c +++ b/libnautilus-private/nautilus-tree-view-drag-dest.c @@ -82,7 +82,6 @@ static const GtkTargetEntry drag_types [] = { { NAUTILUS_ICON_DND_GNOME_ICON_LIST_TYPE, 0, NAUTILUS_ICON_DND_GNOME_ICON_LIST }, { NAUTILUS_ICON_DND_URI_LIST_TYPE, 0, NAUTILUS_ICON_DND_URI_LIST }, { NAUTILUS_ICON_DND_URL_TYPE, 0, NAUTILUS_ICON_DND_URL }, - { NAUTILUS_ICON_DND_TEXT_TYPE, 0, NAUTILUS_ICON_DND_TEXT } /* FIXME: Should handle emblems once the list view supports them */ }; @@ -853,6 +852,7 @@ NautilusTreeViewDragDest * nautilus_tree_view_drag_dest_new (GtkTreeView *tree_view) { NautilusTreeViewDragDest *dest; + GtkTargetList *targets; dest = g_object_new (NAUTILUS_TYPE_TREE_VIEW_DRAG_DEST, NULL); @@ -862,8 +862,11 @@ nautilus_tree_view_drag_dest_new (GtkTreeView *tree_view) gtk_drag_dest_set (GTK_WIDGET (tree_view), 0, drag_types, G_N_ELEMENTS (drag_types), - GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_ASK); - + GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_ASK); + + targets = gtk_drag_dest_get_target_list (GTK_WIDGET (tree_view)); + gtk_target_list_add_text_targets (targets, NAUTILUS_ICON_DND_TEXT); + g_signal_connect_object (tree_view, "drag_motion", G_CALLBACK (drag_motion_callback), |