nautilus r14436 - in trunk: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Sat Aug  2 19:16:46 2008
New Revision: 14436
URL: http://svn.gnome.org/viewvc/nautilus?rev=14436&view=rev

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

	* libnautilus-private/nautilus-icon-container.c (keyboard_move_to):
	Never use linear selection in manual layout.


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-icon-container.c

Modified: trunk/libnautilus-private/nautilus-icon-container.c
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-container.c	(original)
+++ trunk/libnautilus-private/nautilus-icon-container.c	Sat Aug  2 19:16:46 2008
@@ -3123,7 +3123,8 @@
 		set_keyboard_focus (container, icon);
 		container->details->keyboard_rubberband_start = NULL;
 	} else if (event != NULL &&
-		   (event->state & GDK_CONTROL_MASK) != 0 &&
+		   ((event->state & GDK_CONTROL_MASK) != 0 ||
+		    !container->details->auto_layout) &&
 		   (event->state & GDK_SHIFT_MASK) != 0) {
 		/* Do rubberband selection */		
 		EelDRect rect;