diff options
author | Stefano Karapetsas <[email protected]> | 2013-09-22 15:02:58 +0200 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2013-09-22 15:02:58 +0200 |
commit | ddd554133d6362a692f1d2281053c06b94651039 (patch) | |
tree | 4b3c5261920c35b5113ffd8a649a83648dcaf3a8 /src/caja-window-manage-views.c | |
parent | c79f320aba836847f35e5e465754b1ddd62806b4 (diff) | |
parent | 77bd50e13ed0e111a2e1f0c4313caf798d66e8d9 (diff) | |
download | caja-ddd554133d6362a692f1d2281053c06b94651039.tar.bz2 caja-ddd554133d6362a692f1d2281053c06b94651039.tar.xz |
Merge branch 'master' of github.com:mate-desktop/mate-file-manager
Diffstat (limited to 'src/caja-window-manage-views.c')
-rw-r--r-- | src/caja-window-manage-views.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c index c2c5b5ff..c7918e6c 100644 --- a/src/caja-window-manage-views.c +++ b/src/caja-window-manage-views.c @@ -528,7 +528,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot, int new_slot_position; GList *l; gboolean target_navigation = FALSE, target_same = FALSE; - gboolean is_desktop; + gboolean is_desktop, is_navigation; window = slot->pane->window; @@ -553,6 +553,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot, (flags & CAJA_WINDOW_OPEN_FLAG_NEW_TAB) != 0)); is_desktop = CAJA_IS_DESKTOP_WINDOW (window); + is_navigation = CAJA_IS_NAVIGATION_WINDOW (window); target_same = is_desktop && !caja_desktop_window_loaded (CAJA_DESKTOP_WINDOW (window)); @@ -575,6 +576,8 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot, * the target is a navigation. */ target_navigation = TRUE; + } else if (is_navigation) { + target_same = TRUE; } break; case CAJA_WINDOW_OPEN_IN_NAVIGATION : |