From 6c84f94b622421055d681003ede3fb480115e974 Mon Sep 17 00:00:00 2001 From: sebastid Date: Wed, 6 Sep 2006 08:06:19 +0000 Subject: [PATCH] Don't compile old fileman. SVN revision: 25529 --- src/bin/Makefile.am | 22 ---------------------- src/bin/e_includes.h | 11 ----------- src/bin/e_ipc_handlers.h | 16 ---------------- src/bin/e_ipc_handlers_list.h | 2 -- src/bin/e_main.c | 4 +--- 5 files changed, 1 insertion(+), 54 deletions(-) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 8b56b6c15..eb452913c 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -87,11 +87,6 @@ e_theme_about.h \ e_apps_cache.h \ e_editable.h \ e_entry.h \ -e_fileman.h \ -e_fileman_smart.h \ -e_fileman_file.h \ -e_fileman_icon.h \ -e_fileman_mime.h \ e_widget.h \ e_widget_check.h \ e_widget_radio.h \ @@ -105,19 +100,13 @@ e_widget_entry.h \ e_widget_image.h \ e_config_dialog.h \ e_int_config_focus.h \ -e_icon_grid.h \ -e_icon_canvas.h \ e_int_config_desks.h \ e_configure.h \ e_int_border_locks.h \ e_thumb.h \ e_int_border_remember.h \ e_eap_editor.h \ -e_widget_iconsel.h \ -e_widget_fileman.h \ e_scrollframe.h \ -e_file_selector.h \ -e_file_dialog.h \ e_int_border_menu.h \ e_ilist.h \ e_tlist.h \ @@ -243,11 +232,6 @@ e_theme_about.c \ e_apps_cache.c \ e_editable.c \ e_entry.c \ -e_fileman.c \ -e_fileman_smart.c \ -e_fileman_file.c \ -e_fileman_icon.c \ -e_fileman_mime.c \ e_widget.c \ e_widget_check.c \ e_widget_radio.c \ @@ -261,19 +245,13 @@ e_widget_entry.c \ e_widget_image.c \ e_config_dialog.c \ e_int_config_focus.c \ -e_icon_grid.c \ -e_icon_canvas.c \ e_int_config_desks.c \ e_configure.c \ e_int_border_locks.c \ e_thumb.c \ e_int_border_remember.c \ e_eap_editor.c \ -e_widget_iconsel.c \ -e_widget_fileman.c \ e_scrollframe.c \ -e_file_selector.c \ -e_file_dialog.c \ e_int_border_menu.c \ e_ilist.c \ e_tlist.c \ diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h index f0a28cbb3..d9a6075e5 100644 --- a/src/bin/e_includes.h +++ b/src/bin/e_includes.h @@ -61,11 +61,6 @@ #include "e_about.h" #include "e_theme_about.h" #include "e_apps_cache.h" -#include "e_fileman.h" -#include "e_fileman_smart.h" -#include "e_fileman_file.h" -#include "e_fileman_icon.h" -#include "e_fileman_mime.h" #include "e_widget.h" #include "e_widget_check.h" #include "e_widget_radio.h" @@ -77,20 +72,14 @@ #include "e_widget_table.h" #include "e_widget_entry.h" #include "e_widget_image.h" -#include "e_widget_iconsel.h" #include "e_config_dialog.h" #include "e_int_config_focus.h" -#include "e_icon_grid.h" -#include "e_icon_canvas.h" #include "e_int_config_desks.h" #include "e_int_border_locks.h" #include "e_thumb.h" #include "e_int_border_remember.h" #include "e_eap_editor.h" #include "e_scrollframe.h" -#include "e_file_selector.h" -#include "e_file_dialog.h" -#include "e_widget_fileman.h" #include "e_int_border_menu.h" #include "e_ilist.h" #include "e_livethumb.h" diff --git a/src/bin/e_ipc_handlers.h b/src/bin/e_ipc_handlers.h index eaef61a6f..eef6898c8 100644 --- a/src/bin/e_ipc_handlers.h +++ b/src/bin/e_ipc_handlers.h @@ -930,22 +930,6 @@ break; * E_LIB_IN * ... */ -/****************************************************************************/ -#define HDL E_IPC_EFM_START -#if (TYPE == E_REMOTE_OPTIONS) - OP("-start-efm", 1, "Starts the E File Manager in Directory 'OPT1'", 0, HDL) -#elif (TYPE == E_REMOTE_OUT) - REQ_STRING(params[0], HDL); -#elif (TYPE == E_WM_IN) - STRING(s, HDL); - E_Fileman *fileman; - fileman = e_fileman_new_to_dir(e_container_current_get(e_manager_current_get()), s); - e_fileman_show (fileman); - END_STRING(s); -#elif (TYPE == E_REMOTE_IN) -#endif -#undef HDL - /****************************************************************************/ #define HDL E_IPC_EAP_EDIT_START #if (TYPE == E_REMOTE_OPTIONS) diff --git a/src/bin/e_ipc_handlers_list.h b/src/bin/e_ipc_handlers_list.h index a4e173c00..be4d02049 100644 --- a/src/bin/e_ipc_handlers_list.h +++ b/src/bin/e_ipc_handlers_list.h @@ -339,8 +339,6 @@ #define E_IPC_OP_FULLSCREEN_POLICY_GET 321 #define E_IPC_OP_FULLSCREEN_POLICY_GET_REPLY 322 -#define E_IPC_EFM_START 323 - #define E_IPC_OP_EDJE_CACHE_SET 324 #define E_IPC_OP_EDJE_CACHE_GET 325 #define E_IPC_OP_EDJE_CACHE_GET_REPLY 326 diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 72db3aece..aa927273b 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -467,14 +467,12 @@ main(int argc, char **argv) /* init the enlightenment file manager */ - if (!e_fm_icon_init() || !e_fm_init() || !e_fm2_init()) + if (!e_fm2_init()) { e_error_message_show(_("Enlightenment cannot initialize the File manager.\n")); _e_main_shutdown(-1); } _e_main_shutdown_push(e_fm2_shutdown); - _e_main_shutdown_push(e_fm_shutdown); - _e_main_shutdown_push(e_fm_icon_shutdown); /*** Finished loading subsystems, Loading WM Specifics ***/