discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f9fc4b13dec599dc98533bae3d163a088511ce97
commit f9fc4b13dec599dc98533bae3d163a088511ce97 Author: Mike Blumenkrantz <[email protected]> Date: Wed Mar 18 17:40:04 2015 -0400 remove E_Comp usage from fileman/fwin --- src/bin/e_int_menus.c | 2 +- src/modules/fileman/e_fwin.c | 7 ++----- src/modules/fileman/e_mod_dbus.c | 2 +- src/modules/fileman/e_mod_main.c | 8 ++++---- src/modules/fileman/e_mod_main.h | 2 +- src/modules/fileman/e_mod_menu.c | 12 ++++++------ 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index d6d38b2..b4fccc1 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -604,7 +604,7 @@ _e_int_menus_themes_about(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_It static void _e_int_menus_fwin_favorites_item_cb(void *data, E_Menu *m, E_Menu_Item *mi) { - e_fwin_new(e_comp, "favorites", "/"); + e_fwin_new("favorites", "/"); } */ diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 2231b50..7498fc4 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -291,8 +291,7 @@ e_fwin_shutdown(void) * "fwin" window */ void -e_fwin_new(E_Comp *comp EINA_UNUSED, - const char *dev, +e_fwin_new(const char *dev, const char *path) { _e_fwin_new(dev, path); @@ -1913,12 +1912,10 @@ _e_fwin_cb_key_down(void *data, { if (!strcmp(ev->key, "n")) { - E_Comp *comp; const char *dev, *path; - comp = e_comp; e_fm2_path_get(page->fm_obj, &dev, &path); - e_fwin_new(comp, dev, path); + e_fwin_new(dev, path); return; } if (!strcmp(ev->key, "w")) diff --git a/src/modules/fileman/e_mod_dbus.c b/src/modules/fileman/e_mod_dbus.c index 6e28d6e..e2e7020 100644 --- a/src/modules/fileman/e_mod_dbus.c +++ b/src/modules/fileman/e_mod_dbus.c @@ -120,7 +120,7 @@ _e_fileman_dbus_daemon_open_directory_cb(const Eldbus_Service_Interface *iface _ directory = "/"; } - e_fwin_new(e_comp, dev, directory); + e_fwin_new(dev, directory); free(dev); free(to_free); return eldbus_message_method_return_new(msg); diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c index ef78844..4c0b821 100644 --- a/src/modules/fileman/e_mod_main.c +++ b/src/modules/fileman/e_mod_main.c @@ -166,21 +166,21 @@ _e_mod_action_fileman_cb(E_Object *obj EINA_UNUSED, if (zone) { if (params && params[0] == '/') - e_fwin_new(e_comp, "/", params); + e_fwin_new("/", params); else if (params && params[0] == '~') - e_fwin_new(e_comp, "~/", params + 1); + e_fwin_new("~/", params + 1); else if (params && strcmp(params, "(none)")) /* avoid matching paths that no longer exist */ { char *path; path = e_util_shell_env_path_eval(params); if (path) { - e_fwin_new(e_comp, path, "/"); + e_fwin_new(path, "/"); free(path); } } else - e_fwin_new(e_comp, "favorites", "/"); + e_fwin_new("favorites", "/"); } } diff --git a/src/modules/fileman/e_mod_main.h b/src/modules/fileman/e_mod_main.h index 5cf4f05..648c5a0 100644 --- a/src/modules/fileman/e_mod_main.h +++ b/src/modules/fileman/e_mod_main.h @@ -120,7 +120,7 @@ void e_fileman_dbus_shutdown(void); int e_fwin_init (void); int e_fwin_shutdown (void); -void e_fwin_new (E_Comp *comp, const char *dev, const char *path); +void e_fwin_new (const char *dev, const char *path); void e_fwin_zone_new (E_Zone *zone, void *path); void e_fwin_zone_shutdown (E_Zone *zone); void e_fwin_all_unsel (void *data); diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c index 8ebf6ef..5accb0c 100644 --- a/src/modules/fileman/e_mod_menu.c +++ b/src/modules/fileman/e_mod_menu.c @@ -27,7 +27,7 @@ _e_mod_menu_gtk_cb(void *data, 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(e_comp, NULL, data); + else if (m->zone) e_fwin_new(NULL, data); } static void @@ -43,7 +43,7 @@ _e_mod_menu_virtual_cb(void *data, 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(e_comp, data, path ?: "/"); + else if (m->zone) e_fwin_new(data, path ?: "/"); } static void @@ -62,7 +62,7 @@ _e_mod_menu_volume_cb(void *data, (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(e_comp, NULL, vol->mount_point); + e_fwin_new(NULL, vol->mount_point); } else { @@ -73,7 +73,7 @@ _e_mod_menu_volume_cb(void *data, (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(e_comp, buf, "/"); + e_fwin_new(buf, "/"); } } @@ -94,7 +94,7 @@ _e_mod_menu_populate_cb(void *data, (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(e_comp, data, path ?: "/"); + e_fwin_new(data, path ?: "/"); } static void @@ -491,7 +491,7 @@ static void _e_mod_menu_navigate_cb(void *d EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) { if (m->zone) - e_fwin_new(e_comp, "~/", "/"); + e_fwin_new("~/", "/"); } /* returns submenu so we can add Go to Parent */ --
