From c71d026cbf5ae79cb5e639b0ceb23445aa586581 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Mon, 6 Aug 2012 13:23:14 +0000
Subject: [PATCH] fix desktop navigation config detection

SVN revision: 74935
---
 src/modules/fileman/e_mod_main.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index 1faad52e5..481bd1ea4 100644
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -265,8 +265,8 @@ _e_mod_menu_gtk_cb(void           *data,
 
    m = _e_mod_menu_top_get(m);
    fm = e_object_data_get(E_OBJECT(m));
-   if (fileman_config->view.open_dirs_in_place && fm &&
-       (fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_window")))
+   if (fm && ((fileman_config->view.open_dirs_in_place && evas_object_data_get(fm, "page_is_window")) ||
+       (fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_zone"))))
      e_fm2_path_set(fm, NULL, data);
    else if (m->zone) e_fwin_new(m->zone->container, NULL, data);
 }
@@ -280,8 +280,8 @@ _e_mod_menu_virtual_cb(void           *data,
 
    m = _e_mod_menu_top_get(m);
    fm = e_object_data_get(E_OBJECT(m));
-      if (fileman_config->view.open_dirs_in_place && fm &&
-       (fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_window")))
+   if (fm && ((fileman_config->view.open_dirs_in_place && evas_object_data_get(fm, "page_is_window")) ||
+       (fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_zone"))))
      e_fm2_path_set(fm, data, "/");
    else if (m->zone) e_fwin_new(m->zone->container, data, "/");
 }
@@ -298,9 +298,9 @@ _e_mod_menu_volume_cb(void           *data,
    fm = e_object_data_get(E_OBJECT(m));
    if (vol->mounted)
      {
-           if (fileman_config->view.open_dirs_in_place && fm &&
-       (fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_window")))
-     e_fm2_path_set(fm, NULL, vol->mount_point);
+       if (fm && ((fileman_config->view.open_dirs_in_place && evas_object_data_get(fm, "page_is_window")) ||
+           (fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_zone"))))
+         e_fm2_path_set(fm, NULL, vol->mount_point);
         else if (m->zone)
           e_fwin_new(m->zone->container, NULL, vol->mount_point);
      }
@@ -309,9 +309,9 @@ _e_mod_menu_volume_cb(void           *data,
         char buf[PATH_MAX];
 
         snprintf(buf, sizeof(buf), "removable:%s", vol->udi);
-           if (fileman_config->view.open_dirs_in_place && fm &&
-       (fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_window")))
-     e_fm2_path_set(fm, buf, "/");
+        if (fm && ((fileman_config->view.open_dirs_in_place && evas_object_data_get(fm, "page_is_window")) ||
+            (fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_zone"))))
+          e_fm2_path_set(fm, buf, "/");
         else if (m->zone)
           e_fwin_new(m->zone->container, buf, "/");
      }
@@ -401,8 +401,8 @@ _e_mod_menu_populate_cb(void      *data,
 
    fm = e_object_data_get(E_OBJECT(m));
    path = e_object_data_get(E_OBJECT(mi));
-      if (fileman_config->view.open_dirs_in_place && fm &&
-       (fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_window")))
+   if (fm && ((fileman_config->view.open_dirs_in_place && evas_object_data_get(fm, "page_is_window")) ||
+       (fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_zone"))))
      e_fm2_path_set(fm, data, path ?: "/");
    else if (m->zone)
      e_fwin_new(m->zone->container, data, path ?: "/");