summaryrefslogtreecommitdiff
path: root/components/tree
diff options
context:
space:
mode:
authorMathieu Lacage <mathieu@eazel.com>2000-09-07 16:10:17 +0000
committerMathieu Lacage <mathieu@src.gnome.org>2000-09-07 16:10:17 +0000
commit0f1d07d9f924635c9456b3bbba3b4eb508e65010 (patch)
treeb13f81736324d431d3f9b75538e7a4f55eefaa14 /components/tree
parent7525ad41463655620070b883f4f22eb614eca54a (diff)
downloadnautilus-0f1d07d9f924635c9456b3bbba3b4eb508e65010.tar.gz
First work toward bug 2353, fixes bug 2570, 1289
2000-09-07 Mathieu Lacage <mathieu@eazel.com> First work toward bug 2353, fixes bug 2570, 1289 * components/tree/nautilus-tree-view.c: fix a dnd bug in gtk_drag_dest_set. * libnautilus-extensions/nautilus-drag.c: (nautilus_drag_init): initialize the new field drop_occured to FALSE. * libnautilus-extensions/nautilus-drag.h: new field drop_occured. * libnautilus-extensions/nautilus-icon-dnd.c: use the new field and make it behave slightly more sanely by doing actual actions in data_received instead of drag_drop. This is the only way to avoid race conditions. (drag_data_received_callback), (drag_motion_callback), (drag_drop_callback) * libnautilus-extensions/nautilus-list.c: (nautilus_list_initialize_class), (nautilus_list_dnd_initialize), (nautilus_list_initialize), (nautilus_list_drag_start), (nautilus_list_ensure_drag_data), (nautilus_list_drag_begin), (nautilus_list_drag_end), (nautilus_list_drag_leave), (nautilus_list_find_drop_target), (nautilus_list_get_drop_action), (nautilus_list_drag_motion), (nautilus_list_drag_drop), (nautilus_list_drag_data_received): add support for the drop_occured field, fix the same bug as in tree view and make it behave slightly more sanely as in icon view. The tree view now needs some work to catch up with all those changes. * src/file-manager/fm-list-view.c: (fm_list_handle_dropped_icons): space.
Diffstat (limited to 'components/tree')
-rw-r--r--components/tree/nautilus-tree-view.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c
index 52ad30f57..7f86e1399 100644
--- a/components/tree/nautilus-tree-view.c
+++ b/components/tree/nautilus-tree-view.c
@@ -817,9 +817,7 @@ static void
nautilus_tree_view_init_dnd (NautilusTreeView *view)
{
gtk_drag_dest_set (GTK_WIDGET (view->details->tree),
- GTK_DEST_DEFAULT_MOTION
- | GTK_DEST_DEFAULT_HIGHLIGHT
- | GTK_DEST_DEFAULT_DROP,
+ 0,
nautilus_tree_view_dnd_target_table,
NAUTILUS_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
GDK_ACTION_COPY