nautilus r14466 - in trunk: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Wed Aug 13 10:49:19 2008
New Revision: 14466
URL: http://svn.gnome.org/viewvc/nautilus?rev=14466&view=rev

Log:
2008-08-13  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-dnd.c
	(nautilus_drag_default_drop_action_for_icons):
	Use correct target file for same filesystem check when dropping to
	desktop. Fixes #547282.


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	Wed Aug 13 10:49:19 2008
@@ -469,6 +469,10 @@
 		return;
 	} else if (eel_uri_is_desktop (target_uri_string)) {
 		target = nautilus_get_desktop_location ();
+
+		nautilus_file_unref (target_file);
+		target_file = nautilus_file_get (target);
+
 		if (eel_uri_is_desktop (dropped_uri)) {
 			/* Only move to Desktop icons */
 			if (actions & GDK_ACTION_MOVE) {