nautilus r13692 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Mon Feb  4 13:57:35 2008
New Revision: 13692
URL: http://svn.gnome.org/viewvc/nautilus?rev=13692&view=rev

Log:
2008-02-04  Alexander Larsson  <alexl redhat com>

	* libnautilus-private/nautilus-dnd.c ()
	(nautilus_drag_default_drop_action_for_icons):
	Default to move when dragging from trash.



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-dnd.c

Modified: trunk/libnautilus-private/nautilus-dnd.c
==============================================================================
--- trunk/libnautilus-private/nautilus-dnd.c	(original)
+++ trunk/libnautilus-private/nautilus-dnd.c	Mon Feb  4 13:57:35 2008
@@ -427,7 +427,8 @@
 	same_fs = check_same_fs (target, dropped);
 	target_is_source_parent = g_file_contains_file (target, dropped);
 	
-	if (same_fs || target_is_source_parent) {
+	if (same_fs || target_is_source_parent ||
+	    g_file_has_uri_scheme (dropped, "trash")) {
 		if (actions & GDK_ACTION_MOVE) {
 			*action = GDK_ACTION_MOVE;
 		} else {