nautilus r14146 - in branches/multiview: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Wed May  7 21:11:43 2008
New Revision: 14146
URL: http://svn.gnome.org/viewvc/nautilus?rev=14146&view=rev

Log:
2008-05-07  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-mime-actions.c (activate_files):
	Do not set NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB and
	NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW at the same time.


Modified:
   branches/multiview/ChangeLog
   branches/multiview/libnautilus-private/nautilus-mime-actions.c

Modified: branches/multiview/libnautilus-private/nautilus-mime-actions.c
==============================================================================
--- branches/multiview/libnautilus-private/nautilus-mime-actions.c	(original)
+++ branches/multiview/libnautilus-private/nautilus-mime-actions.c	Wed May  7 21:11:43 2008
@@ -1141,7 +1141,9 @@
 
 		flags = parameters->flags;
 		if (count > 1) {
-			flags |= NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW;
+			if ((parameters->flags & NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW) == 0) {
+				flags |= NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB;
+			}
 		}
 
 		for (l = open_in_view_files; l != NULL; l = l->next) {