diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-05-07 21:11:43 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-05-07 21:11:43 +0000 |
| commit | 19b7c2eae2f18d6f17f9ad35753a5dd77a61b8d7 (patch) | |
| tree | 915a205db5dca888a5fd80eff9fb21be23fe73bc | |
| parent | c41c31124b58df8375a39461a02da8a88a8b0401 (diff) | |
| download | nautilus-19b7c2eae2f18d6f17f9ad35753a5dd77a61b8d7.tar.gz | |
Do not set NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB and
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.
svn path=/branches/multiview/; revision=14146
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-mime-actions.c | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,5 +1,11 @@ 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. + +2008-05-07 Christian Neumair <cneumair@gnome.org> + * src/file-manager/fm-directory-view.c (real_update_menus): Only make "Open in New Tab" item sensitive if items are selected. diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c index d8370ecb6..011acef63 100644 --- a/libnautilus-private/nautilus-mime-actions.c +++ b/libnautilus-private/nautilus-mime-actions.c @@ -1141,7 +1141,9 @@ activate_files (ActivateParameters *parameters) 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) { |