* ecore: Move ecore_job inside ecore.
Patch from Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com>. SVN revision: 45570
This commit is contained in:
parent
306d3dee1f
commit
2fab25c3bb
|
@ -302,7 +302,6 @@ PKG_CHECK_MODULES(E, [
|
||||||
ecore-input-evas
|
ecore-input-evas
|
||||||
ecore-con
|
ecore-con
|
||||||
ecore-ipc
|
ecore-ipc
|
||||||
ecore-job
|
|
||||||
ecore-file
|
ecore-file
|
||||||
eet >= 1.2.3
|
eet >= 1.2.3
|
||||||
edje
|
edje
|
||||||
|
@ -313,7 +312,7 @@ PKG_CHECK_MODULES(E, [
|
||||||
edbus
|
edbus
|
||||||
ehal
|
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], [], [:])
|
AC_E_CHECK_PKG(ECORE_IMF, [ecore-imf ecore-imf-evas], [], [:])
|
||||||
|
|
||||||
|
|
|
@ -89,7 +89,6 @@ void *alloca (size_t);
|
||||||
#include <Ecore_Input_Evas.h>
|
#include <Ecore_Input_Evas.h>
|
||||||
#include <Ecore_Con.h>
|
#include <Ecore_Con.h>
|
||||||
#include <Ecore_Ipc.h>
|
#include <Ecore_Ipc.h>
|
||||||
#include <Ecore_Job.h>
|
|
||||||
#include <Ecore_File.h>
|
#include <Ecore_File.h>
|
||||||
#include <Eet.h>
|
#include <Eet.h>
|
||||||
#include <Edje.h>
|
#include <Edje.h>
|
||||||
|
|
|
@ -690,7 +690,7 @@ e_fm2_init(void)
|
||||||
char path[PATH_MAX];
|
char path[PATH_MAX];
|
||||||
|
|
||||||
eina_init();
|
eina_init();
|
||||||
ecore_job_init();
|
ecore_init();
|
||||||
_e_storage_volume_edd_init();
|
_e_storage_volume_edd_init();
|
||||||
e_user_dir_concat_static(path, "fileman/metadata");
|
e_user_dir_concat_static(path, "fileman/metadata");
|
||||||
ecore_file_mkpath(path);
|
ecore_file_mkpath(path);
|
||||||
|
@ -791,7 +791,7 @@ e_fm2_shutdown(void)
|
||||||
_e_storage_volume_edd_shutdown();
|
_e_storage_volume_edd_shutdown();
|
||||||
e_fm2_op_registry_shutdown();
|
e_fm2_op_registry_shutdown();
|
||||||
efreet_mime_shutdown();
|
efreet_mime_shutdown();
|
||||||
ecore_job_shutdown();
|
ecore_shutdown();
|
||||||
eina_shutdown();
|
eina_shutdown();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -392,8 +392,6 @@ main(int argc, char **argv)
|
||||||
#endif
|
#endif
|
||||||
// FIXME: SEGV's on shutdown if fm2 windows up - disable for now.
|
// FIXME: SEGV's on shutdown if fm2 windows up - disable for now.
|
||||||
// _e_main_shutdown_push(ecore_shutdown);
|
// _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 */
|
/* init edje and set it up in frozen mode */
|
||||||
edje_init();
|
edje_init();
|
||||||
|
|
Loading…
Reference in New Issue