diff --git a/configure.ac b/configure.ac index 08558e55b..8879188d6 100644 --- a/configure.ac +++ b/configure.ac @@ -302,7 +302,6 @@ PKG_CHECK_MODULES(E, [ ecore-input-evas ecore-con ecore-ipc - ecore-job ecore-file eet >= 1.2.3 edje @@ -313,7 +312,7 @@ PKG_CHECK_MODULES(E, [ edbus ehal ]) -requirements_e="evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-job ecore-file eet edje efreet efreet-mime eina-0 dbus-1 edbus ehal" +requirements_e="evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-file eet edje efreet efreet-mime eina-0 dbus-1 edbus ehal" AC_E_CHECK_PKG(ECORE_IMF, [ecore-imf ecore-imf-evas], [], [:]) diff --git a/src/bin/e.h b/src/bin/e.h index 17705f28a..dca03432a 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -89,7 +89,6 @@ void *alloca (size_t); #include #include #include -#include #include #include #include diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 7bec6c844..6c93b76d6 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -690,7 +690,7 @@ e_fm2_init(void) char path[PATH_MAX]; eina_init(); - ecore_job_init(); + ecore_init(); _e_storage_volume_edd_init(); e_user_dir_concat_static(path, "fileman/metadata"); ecore_file_mkpath(path); @@ -791,7 +791,7 @@ e_fm2_shutdown(void) _e_storage_volume_edd_shutdown(); e_fm2_op_registry_shutdown(); efreet_mime_shutdown(); - ecore_job_shutdown(); + ecore_shutdown(); eina_shutdown(); return 1; } diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 30b628d30..e9a14fa10 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -392,8 +392,6 @@ main(int argc, char **argv) #endif // FIXME: SEGV's on shutdown if fm2 windows up - disable for now. // _e_main_shutdown_push(ecore_shutdown); - ecore_job_init(); - _e_main_shutdown_push(ecore_job_shutdown); /* init edje and set it up in frozen mode */ edje_init();