forked from enlightenment/enlightenment
fix desktop navigation config detection
SVN revision: 74935
This commit is contained in:
parent
01b94ccc04
commit
c71d026cbf
|
@ -265,8 +265,8 @@ _e_mod_menu_gtk_cb(void *data,
|
||||||
|
|
||||||
m = _e_mod_menu_top_get(m);
|
m = _e_mod_menu_top_get(m);
|
||||||
fm = e_object_data_get(E_OBJECT(m));
|
fm = e_object_data_get(E_OBJECT(m));
|
||||||
if (fileman_config->view.open_dirs_in_place && fm &&
|
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_window")))
|
(fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_zone"))))
|
||||||
e_fm2_path_set(fm, NULL, data);
|
e_fm2_path_set(fm, NULL, data);
|
||||||
else if (m->zone) e_fwin_new(m->zone->container, 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);
|
m = _e_mod_menu_top_get(m);
|
||||||
fm = e_object_data_get(E_OBJECT(m));
|
fm = e_object_data_get(E_OBJECT(m));
|
||||||
if (fileman_config->view.open_dirs_in_place && fm &&
|
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_window")))
|
(fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_zone"))))
|
||||||
e_fm2_path_set(fm, data, "/");
|
e_fm2_path_set(fm, data, "/");
|
||||||
else if (m->zone) e_fwin_new(m->zone->container, 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));
|
fm = e_object_data_get(E_OBJECT(m));
|
||||||
if (vol->mounted)
|
if (vol->mounted)
|
||||||
{
|
{
|
||||||
if (fileman_config->view.open_dirs_in_place && fm &&
|
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_window")))
|
(fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_zone"))))
|
||||||
e_fm2_path_set(fm, NULL, vol->mount_point);
|
e_fm2_path_set(fm, NULL, vol->mount_point);
|
||||||
else if (m->zone)
|
else if (m->zone)
|
||||||
e_fwin_new(m->zone->container, NULL, vol->mount_point);
|
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];
|
char buf[PATH_MAX];
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "removable:%s", vol->udi);
|
snprintf(buf, sizeof(buf), "removable:%s", vol->udi);
|
||||||
if (fileman_config->view.open_dirs_in_place && fm &&
|
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_window")))
|
(fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_zone"))))
|
||||||
e_fm2_path_set(fm, buf, "/");
|
e_fm2_path_set(fm, buf, "/");
|
||||||
else if (m->zone)
|
else if (m->zone)
|
||||||
e_fwin_new(m->zone->container, buf, "/");
|
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));
|
fm = e_object_data_get(E_OBJECT(m));
|
||||||
path = e_object_data_get(E_OBJECT(mi));
|
path = e_object_data_get(E_OBJECT(mi));
|
||||||
if (fileman_config->view.open_dirs_in_place && fm &&
|
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_window")))
|
(fileman_config->view.desktop_navigation || evas_object_data_get(fm, "page_is_zone"))))
|
||||||
e_fm2_path_set(fm, data, path ?: "/");
|
e_fm2_path_set(fm, data, path ?: "/");
|
||||||
else if (m->zone)
|
else if (m->zone)
|
||||||
e_fwin_new(m->zone->container, data, path ?: "/");
|
e_fwin_new(m->zone->container, data, path ?: "/");
|
||||||
|
|
Loading…
Reference in New Issue