summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-09-20 13:50:34 -0700
committerStefano Karapetsas <[email protected]>2013-09-20 13:50:34 -0700
commit77bd50e13ed0e111a2e1f0c4313caf798d66e8d9 (patch)
treeabe3fdcbb3206df8b21d2fddb1825310b0e8c6f7 /src
parentacccd87b60837f610e1c4fd4d57937b9cb8e7bc4 (diff)
parent6daeceae71a22d14893404a2e95bc89112674c69 (diff)
downloadcaja-77bd50e13ed0e111a2e1f0c4313caf798d66e8d9.tar.bz2
caja-77bd50e13ed0e111a2e1f0c4313caf798d66e8d9.tar.xz
Merge pull request #112 from aubade/browserfix
Make browser windows always open new folders in the same window, even when Spatial enabled
Diffstat (limited to 'src')
-rw-r--r--src/caja-window-manage-views.c5
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 :