summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2010-01-25 21:59:21 +0000
committerCedric BAIL <cedric.bail@free.fr>2010-01-25 21:59:21 +0000
commit44193541f71101ee365afec23a9efdb901c4413f (patch)
tree5f0ad72829e91e9466cc54cd2671fc476c3c3971
parent0e0534c564a1c020a4837a5009860a8f23f129a9 (diff)
* ecore: Move ecore_job inside ecore.
Patch from Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com>. SVN revision: 45570
-rw-r--r--legacy/ecore/Makefile.am5
-rw-r--r--legacy/ecore/configure.ac15
-rw-r--r--legacy/ecore/debian/control13
-rw-r--r--legacy/ecore/debian/libecore-dev.install1
-rw-r--r--legacy/ecore/debian/libecore-job-svn-01.install1
-rw-r--r--legacy/ecore/debian/libecore-job-svn-01.shlibs1
-rw-r--r--legacy/ecore/src/lib/Makefile.am1
-rw-r--r--legacy/ecore/src/lib/ecore/Ecore.h4
-rw-r--r--legacy/ecore/src/lib/ecore/Makefile.am1
-rw-r--r--legacy/ecore/src/lib/ecore/ecore.c2
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_job.c (renamed from legacy/ecore/src/lib/ecore_job/ecore_job.c)41
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_private.h4
-rw-r--r--legacy/ecore/src/lib/ecore_job/Ecore_Job.h56
-rw-r--r--legacy/ecore/src/lib/ecore_job/Makefile.am30
-rw-r--r--legacy/ecore/src/lib/ecore_job/ecore_job_private.h47
-rw-r--r--legacy/edje/configure.ac3
-rw-r--r--legacy/edje/src/lib/edje_main.c20
-rw-r--r--legacy/edje/src/lib/edje_private.h1
-rw-r--r--legacy/emotion/configure.ac4
-rw-r--r--legacy/emotion/src/lib/emotion_private.h1
-rw-r--r--legacy/emotion/src/lib/emotion_smart.c4
21 files changed, 38 insertions, 217 deletions
diff --git a/legacy/ecore/Makefile.am b/legacy/ecore/Makefile.am
index 2c566e1269..3b24904ae2 100644
--- a/legacy/ecore/Makefile.am
+++ b/legacy/ecore/Makefile.am
@@ -72,7 +72,6 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN \
72 ecore-imf.pc.in \ 72 ecore-imf.pc.in \
73 ecore-imf-evas.pc.in \ 73 ecore-imf-evas.pc.in \
74 ecore-ipc.pc.in \ 74 ecore-ipc.pc.in \
75 ecore-job.pc.in \
76 ecore-txt.pc.in \ 75 ecore-txt.pc.in \
77 ecore-x.pc.in \ 76 ecore-x.pc.in \
78 ecore-win32.pc.in \ 77 ecore-win32.pc.in \
@@ -129,10 +128,6 @@ if BUILD_ECORE_IPC
129pkgconfig_DATA += ecore-ipc.pc 128pkgconfig_DATA += ecore-ipc.pc
130endif 129endif
131 130
132if BUILD_ECORE_JOB
133pkgconfig_DATA += ecore-job.pc
134endif
135
136if BUILD_ECORE_TXT 131if BUILD_ECORE_TXT
137pkgconfig_DATA += ecore-txt.pc 132pkgconfig_DATA += ecore-txt.pc
138endif 133endif
diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac
index 2265bda21e..b33f3b6bb4 100644
--- a/legacy/ecore/configure.ac
+++ b/legacy/ecore/configure.ac
@@ -47,7 +47,6 @@ case "$host_os" in
47 ecore_input_release_info="-release $release" 47 ecore_input_release_info="-release $release"
48 ecore_input_evas_release_info="-release $release" 48 ecore_input_evas_release_info="-release $release"
49 ecore_ipc_release_info="-release $release" 49 ecore_ipc_release_info="-release $release"
50 ecore_job_release_info="-release $release"
51 ecore_quartz_release_info="-release $release" 50 ecore_quartz_release_info="-release $release"
52 ecore_release_info="-release $release" 51 ecore_release_info="-release $release"
53 ecore_sdl_release_info="-release $release" 52 ecore_sdl_release_info="-release $release"
@@ -67,7 +66,6 @@ AC_SUBST(ecore_imf_release_info)
67AC_SUBST(ecore_input_release_info) 66AC_SUBST(ecore_input_release_info)
68AC_SUBST(ecore_input_evas_release_info) 67AC_SUBST(ecore_input_evas_release_info)
69AC_SUBST(ecore_ipc_release_info) 68AC_SUBST(ecore_ipc_release_info)
70AC_SUBST(ecore_job_release_info)
71AC_SUBST(ecore_quartz_release_info) 69AC_SUBST(ecore_quartz_release_info)
72AC_SUBST(ecore_release_info) 70AC_SUBST(ecore_release_info)
73AC_SUBST(ecore_sdl_release_info) 71AC_SUBST(ecore_sdl_release_info)
@@ -96,7 +94,6 @@ want_tslib="no"
96want_glib="no" 94want_glib="no"
97 95
98# core modules 96# core modules
99want_ecore_job="yes"
100want_ecore_txt="yes" 97want_ecore_txt="yes"
101want_ecore_con="no" 98want_ecore_con="no"
102want_ecore_ipc="no" 99want_ecore_ipc="no"
@@ -206,7 +203,6 @@ requirements_ecore_imf_evas=""
206requirements_ecore_input="" 203requirements_ecore_input=""
207requirements_ecore_input_evas="" 204requirements_ecore_input_evas=""
208requirements_ecore_ipc="" 205requirements_ecore_ipc=""
209requirements_ecore_job=""
210requirements_ecore_quartz="" 206requirements_ecore_quartz=""
211requirements_ecore_sdl="" 207requirements_ecore_sdl=""
212requirements_ecore_txt="" 208requirements_ecore_txt=""
@@ -302,10 +298,8 @@ case "$host_os" in
302 requirements_ecore_file="evil ${requirements_ecore_file}" 298 requirements_ecore_file="evil ${requirements_ecore_file}"
303 requirements_ecore_imf="evil ${requirements_ecore_imf}" 299 requirements_ecore_imf="evil ${requirements_ecore_imf}"
304 requirements_ecore_imf_evas="evil ${requirements_ecore_imf_evas}" 300 requirements_ecore_imf_evas="evil ${requirements_ecore_imf_evas}"
305 requirements_ecore_job="evil ${requirements_ecore_job}"
306 requirements_ecore_txt="evil ${requirements_ecore_txt}" 301 requirements_ecore_txt="evil ${requirements_ecore_txt}"
307 EFL_ECORE_BUILD="-DEFL_ECORE_BUILD" 302 EFL_ECORE_BUILD="-DEFL_ECORE_BUILD"
308 EFL_ECORE_JOB_BUILD="-DEFL_ECORE_JOB_BUILD"
309 EFL_ECORE_TXT_BUILD="-DEFL_ECORE_TXT_BUILD" 303 EFL_ECORE_TXT_BUILD="-DEFL_ECORE_TXT_BUILD"
310 EFL_ECORE_FILE_BUILD="-DEFL_ECORE_FILE_BUILD" 304 EFL_ECORE_FILE_BUILD="-DEFL_ECORE_FILE_BUILD"
311 EFL_ECORE_EVAS_BUILD="-DEFL_ECORE_EVAS_BUILD" 305 EFL_ECORE_EVAS_BUILD="-DEFL_ECORE_EVAS_BUILD"
@@ -332,7 +326,6 @@ case "$host_os" in
332esac 326esac
333 327
334AC_SUBST(EFL_ECORE_BUILD) 328AC_SUBST(EFL_ECORE_BUILD)
335AC_SUBST(EFL_ECORE_JOB_BUILD)
336AC_SUBST(EFL_ECORE_TXT_BUILD) 329AC_SUBST(EFL_ECORE_TXT_BUILD)
337AC_SUBST(EFL_ECORE_FILE_BUILD) 330AC_SUBST(EFL_ECORE_FILE_BUILD)
338AC_SUBST(EFL_ECORE_EVAS_BUILD) 331AC_SUBST(EFL_ECORE_EVAS_BUILD)
@@ -378,7 +371,6 @@ requirements_ecore_imf_evas="ecore eina-0 ${requirements_ecore_imf_evas}"
378requirements_ecore_input="ecore eina-0 ${requirements_ecore_input}" 371requirements_ecore_input="ecore eina-0 ${requirements_ecore_input}"
379requirements_ecore_input_evas="ecore eina-0 ${requirements_ecore_input_evas}" 372requirements_ecore_input_evas="ecore eina-0 ${requirements_ecore_input_evas}"
380requirements_ecore_ipc="ecore eina-0 ${requirements_ecore_ipc}" 373requirements_ecore_ipc="ecore eina-0 ${requirements_ecore_ipc}"
381requirements_ecore_job="ecore eina-0 ${requirements_ecore_job}"
382requirements_ecore_quartz="ecore eina-0 ${requirements_ecore_quartz}" 374requirements_ecore_quartz="ecore eina-0 ${requirements_ecore_quartz}"
383requirements_ecore_sdl="ecore eina-0 ${requirements_ecore_sdl}" 375requirements_ecore_sdl="ecore eina-0 ${requirements_ecore_sdl}"
384requirements_ecore_win32="ecore eina-0 ${requirements_ecore_win32}" 376requirements_ecore_win32="ecore eina-0 ${requirements_ecore_win32}"
@@ -799,9 +791,6 @@ fi
799 791
800## Core modules 792## Core modules
801 793
802# ecore_job
803ECORE_CHECK_MODULE([Job], [${want_ecore_job}])
804
805# ecore_txt 794# ecore_txt
806ECORE_CHECK_MODULE([Txt], [${want_ecore_txt}], [$have_iconv]) 795ECORE_CHECK_MODULE([Txt], [${want_ecore_txt}], [$have_iconv])
807 796
@@ -1139,7 +1128,6 @@ AC_SUBST(requirements_ecore_imf_evas)
1139AC_SUBST(requirements_ecore_input) 1128AC_SUBST(requirements_ecore_input)
1140AC_SUBST(requirements_ecore_input_evas) 1129AC_SUBST(requirements_ecore_input_evas)
1141AC_SUBST(requirements_ecore_ipc) 1130AC_SUBST(requirements_ecore_ipc)
1142AC_SUBST(requirements_ecore_job)
1143AC_SUBST(requirements_ecore_quartz) 1131AC_SUBST(requirements_ecore_quartz)
1144AC_SUBST(requirements_ecore_sdl) 1132AC_SUBST(requirements_ecore_sdl)
1145AC_SUBST(requirements_ecore_txt) 1133AC_SUBST(requirements_ecore_txt)
@@ -1158,7 +1146,6 @@ ecore-file.pc
1158ecore-imf.pc 1146ecore-imf.pc
1159ecore-imf-evas.pc 1147ecore-imf-evas.pc
1160ecore-ipc.pc 1148ecore-ipc.pc
1161ecore-job.pc
1162ecore-txt.pc 1149ecore-txt.pc
1163ecore-x.pc 1150ecore-x.pc
1164ecore-input.pc 1151ecore-input.pc
@@ -1174,7 +1161,6 @@ src/Makefile
1174src/bin/Makefile 1161src/bin/Makefile
1175src/lib/Makefile 1162src/lib/Makefile
1176src/lib/ecore/Makefile 1163src/lib/ecore/Makefile
1177src/lib/ecore_job/Makefile
1178src/lib/ecore_x/Makefile 1164src/lib/ecore_x/Makefile
1179src/lib/ecore_x/xlib/Makefile 1165src/lib/ecore_x/xlib/Makefile
1180src/lib/ecore_x/xcb/Makefile 1166src/lib/ecore_x/xcb/Makefile
@@ -1209,7 +1195,6 @@ echo
1209echo " Ecore........................: always" 1195echo " Ecore........................: always"
1210echo " Thread support.............: $have_pthread" 1196echo " Thread support.............: $have_pthread"
1211echo " GLib support...............: $have_glib" 1197echo " GLib support...............: $have_glib"
1212echo " Ecore_Job....................: $have_ecore_job"
1213echo " Ecore_Txt....................: $have_ecore_txt" 1198echo " Ecore_Txt....................: $have_ecore_txt"
1214echo " Ecore_Con....................: $have_ecore_con" 1199echo " Ecore_Con....................: $have_ecore_con"
1215if test "x$have_ecore_con" = "xyes" ; then 1200if test "x$have_ecore_con" = "xyes" ; then
diff --git a/legacy/ecore/debian/control b/legacy/ecore/debian/control
index 6e492da9d3..de0124ed32 100644
--- a/legacy/ecore/debian/control
+++ b/legacy/ecore/debian/control
@@ -119,18 +119,6 @@ Description: Ecore inter-process communication functions
119 . 119 .
120 This package contains the Ecore inter-process communication functions. 120 This package contains the Ecore inter-process communication functions.
121 121
122Package: libecore-job-svn-01
123Architecture: any
124Depends: ${misc:Depends}, ${shlibs:Depends}
125Description: Ecore job dealing functions
126 This is the core event abstraction layer and X abstraction layer that makes
127 doing selections, Xdnd, general X stuff, and event loops, timeouts and idle
128 handlers fast, optimized, and convenient. It's a separate library so anyone
129 can make use of the work put into Ecore to make this job easy for
130 applications.
131 .
132 This package contains functions for dealing with Ecore jobs.
133
134Package: libecore-txt-svn-01 122Package: libecore-txt-svn-01
135Architecture: any 123Architecture: any
136Depends: ${misc:Depends}, ${shlibs:Depends} 124Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -169,7 +157,6 @@ Depends: ${misc:Depends}, libecore-svn-01 (= ${binary:Version}),
169 libecore-imf-svn-01 (= ${binary:Version}), 157 libecore-imf-svn-01 (= ${binary:Version}),
170 libecore-input-svn-01 (= ${binary:Version}), 158 libecore-input-svn-01 (= ${binary:Version}),
171 libecore-ipc-svn-01 (= ${binary:Version}), 159 libecore-ipc-svn-01 (= ${binary:Version}),
172 libecore-job-svn-01 (= ${binary:Version}),
173 libecore-txt-svn-01 (= ${binary:Version}), 160 libecore-txt-svn-01 (= ${binary:Version}),
174 libecore-x-svn-01 (= ${binary:Version}), 161 libecore-x-svn-01 (= ${binary:Version}),
175 libeet-dev, libevas-dev (>= 0.9.9.060), libeina-dev, pkg-config, 162 libeet-dev, libevas-dev (>= 0.9.9.060), libeina-dev, pkg-config,
diff --git a/legacy/ecore/debian/libecore-dev.install b/legacy/ecore/debian/libecore-dev.install
index 009af662cb..9e3b37d0fb 100644
--- a/legacy/ecore/debian/libecore-dev.install
+++ b/legacy/ecore/debian/libecore-dev.install
@@ -10,7 +10,6 @@ debian/tmp/usr/lib/libecore_imf_evas.so
10debian/tmp/usr/lib/libecore_imf.so 10debian/tmp/usr/lib/libecore_imf.so
11debian/tmp/usr/lib/libecore_input.so 11debian/tmp/usr/lib/libecore_input.so
12debian/tmp/usr/lib/libecore_ipc.so 12debian/tmp/usr/lib/libecore_ipc.so
13debian/tmp/usr/lib/libecore_job.so
14debian/tmp/usr/lib/libecore_txt.so 13debian/tmp/usr/lib/libecore_txt.so
15debian/tmp/usr/lib/libecore_x.so 14debian/tmp/usr/lib/libecore_x.so
16debian/tmp/usr/lib/pkgconfig/ecore*.pc 15debian/tmp/usr/lib/pkgconfig/ecore*.pc
diff --git a/legacy/ecore/debian/libecore-job-svn-01.install b/legacy/ecore/debian/libecore-job-svn-01.install
deleted file mode 100644
index 92f0d195ec..0000000000
--- a/legacy/ecore/debian/libecore-job-svn-01.install
+++ /dev/null
@@ -1 +0,0 @@
1debian/tmp/usr/lib/libecore_job-*.so.*
diff --git a/legacy/ecore/debian/libecore-job-svn-01.shlibs b/legacy/ecore/debian/libecore-job-svn-01.shlibs
deleted file mode 100644
index 970384194e..0000000000
--- a/legacy/ecore/debian/libecore-job-svn-01.shlibs
+++ /dev/null
@@ -1 +0,0 @@
1libecore_job-ver-pre-svn-01 0 libecore-job-svn-01 (>= 0.9.9.060+svnYYYYMMDD)
diff --git a/legacy/ecore/src/lib/Makefile.am b/legacy/ecore/src/lib/Makefile.am
index f87751e10f..eb16664025 100644
--- a/legacy/ecore/src/lib/Makefile.am
+++ b/legacy/ecore/src/lib/Makefile.am
@@ -4,7 +4,6 @@ SUBDIRS = \
4ecore \ 4ecore \
5ecore_input \ 5ecore_input \
6ecore_input_evas \ 6ecore_input_evas \
7ecore_job \
8ecore_txt \ 7ecore_txt \
9ecore_fb \ 8ecore_fb \
10ecore_directfb \ 9ecore_directfb \
diff --git a/legacy/ecore/src/lib/ecore/Ecore.h b/legacy/ecore/src/lib/ecore/Ecore.h
index 0ba8329780..4da5db1802 100644
--- a/legacy/ecore/src/lib/ecore/Ecore.h
+++ b/legacy/ecore/src/lib/ecore/Ecore.h
@@ -145,6 +145,8 @@ extern "C" {
145 typedef struct _Ecore_Exe_Event_Data Ecore_Exe_Event_Data; /**< Data from a child process */ 145 typedef struct _Ecore_Exe_Event_Data Ecore_Exe_Event_Data; /**< Data from a child process */
146 typedef struct _Ecore_Thread Ecore_Thread; 146 typedef struct _Ecore_Thread Ecore_Thread;
147 147
148 typedef struct _Ecore_Job Ecore_Job; /**< A job handle */
149
148 struct _Ecore_Event_Signal_User /** User signal event */ 150 struct _Ecore_Event_Signal_User /** User signal event */
149 { 151 {
150 int number; /**< The signal number. Either 1 or 2 */ 152 int number; /**< The signal number. Either 1 or 2 */
@@ -336,6 +338,8 @@ extern "C" {
336 EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, int (*func) (void *data), const void *data); 338 EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, int (*func) (void *data), const void *data);
337 EAPI void *ecore_poller_del(Ecore_Poller *poller); 339 EAPI void *ecore_poller_del(Ecore_Poller *poller);
338 340
341 EAPI Ecore_Job *ecore_job_add(void (*func) (void *data), const void *data);
342 EAPI void *ecore_job_del(Ecore_Job *job);
339 343
340#ifdef __cplusplus 344#ifdef __cplusplus
341} 345}
diff --git a/legacy/ecore/src/lib/ecore/Makefile.am b/legacy/ecore/src/lib/ecore/Makefile.am
index af7d471ba9..1f392cd9bf 100644
--- a/legacy/ecore/src/lib/ecore/Makefile.am
+++ b/legacy/ecore/src/lib/ecore/Makefile.am
@@ -20,6 +20,7 @@ ecore_hash.c \
20ecore_idle_enterer.c \ 20ecore_idle_enterer.c \
21ecore_idle_exiter.c \ 21ecore_idle_exiter.c \
22ecore_idler.c \ 22ecore_idler.c \
23ecore_job.c \
23ecore_list.c \ 24ecore_list.c \
24ecore_main.c \ 25ecore_main.c \
25ecore_path.c \ 26ecore_path.c \
diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c
index 5a04ef4361..9a2d70b56e 100644
--- a/legacy/ecore/src/lib/ecore/ecore.c
+++ b/legacy/ecore/src/lib/ecore/ecore.c
@@ -99,6 +99,7 @@ ecore_init(void)
99 _ecore_exe_init(); 99 _ecore_exe_init();
100 _ecore_thread_init(); 100 _ecore_thread_init();
101 _ecore_glib_init(); 101 _ecore_glib_init();
102 _ecore_job_init();
102 _ecore_loop_time = ecore_time_get(); 103 _ecore_loop_time = ecore_time_get();
103 104
104 return _ecore_init_count; 105 return _ecore_init_count;
@@ -132,6 +133,7 @@ ecore_shutdown(void)
132 _ecore_poller_shutdown(); 133 _ecore_poller_shutdown();
133 _ecore_animator_shutdown(); 134 _ecore_animator_shutdown();
134 _ecore_glib_shutdown(); 135 _ecore_glib_shutdown();
136 _ecore_job_shutdown();
135 _ecore_thread_shutdown(); 137 _ecore_thread_shutdown();
136 _ecore_exe_shutdown(); 138 _ecore_exe_shutdown();
137 _ecore_idle_enterer_shutdown(); 139 _ecore_idle_enterer_shutdown();
diff --git a/legacy/ecore/src/lib/ecore_job/ecore_job.c b/legacy/ecore/src/lib/ecore/ecore_job.c
index d8e3f491bc..0557a696d5 100644
--- a/legacy/ecore/src/lib/ecore_job/ecore_job.c
+++ b/legacy/ecore/src/lib/ecore/ecore_job.c
@@ -10,50 +10,33 @@
10 10
11#include "Ecore.h" 11#include "Ecore.h"
12#include "ecore_private.h" 12#include "ecore_private.h"
13#include "ecore_job_private.h"
14#include "Ecore_Job.h"
15 13
16int _ecore_job_log_dom = -1;
17static int _ecore_job_event_handler(void *data, int type, void *ev); 14static int _ecore_job_event_handler(void *data, int type, void *ev);
18static void _ecore_job_event_free(void *data, void *ev); 15static void _ecore_job_event_free(void *data, void *ev);
19 16
20static int ecore_event_job_type = 0; 17static int ecore_event_job_type = 0;
21static int _ecore_job_init_count = 0;
22static Ecore_Event_Handler* _ecore_job_handler = NULL; 18static Ecore_Event_Handler* _ecore_job_handler = NULL;
23 19
24EAPI int 20struct _Ecore_Job
25ecore_job_init(void)
26{ 21{
27 if (++_ecore_job_init_count != 1) 22 ECORE_MAGIC;
28 return _ecore_job_init_count; 23 Ecore_Event *event;
29 _ecore_job_log_dom = eina_log_domain_register("EcoreJob", ECORE_JOB_DEFAULT_LOG_COLOR); 24 void (*func) (void *data);
30 if(_ecore_job_log_dom < 0) 25 void *data;
31 { 26};
32 EINA_LOG_ERR("Impossible to create a log domain for the Ecore Job module.");
33 return _ecore_job_init_count--;
34 }
35 if (!ecore_init())
36 return --_ecore_job_init_count;
37 27
28void
29_ecore_job_init(void)
30{
38 ecore_event_job_type = ecore_event_type_new(); 31 ecore_event_job_type = ecore_event_type_new();
39 _ecore_job_handler = ecore_event_handler_add(ecore_event_job_type, _ecore_job_event_handler, NULL); 32 _ecore_job_handler = ecore_event_handler_add(ecore_event_job_type, _ecore_job_event_handler, NULL);
40
41 return _ecore_job_init_count;
42} 33}
43 34
44EAPI int 35void
45ecore_job_shutdown(void) 36_ecore_job_shutdown(void)
46{ 37{
47 if (--_ecore_job_init_count != 0)
48 return _ecore_job_init_count;
49
50 ecore_event_handler_del(_ecore_job_handler); 38 ecore_event_handler_del(_ecore_job_handler);
51 _ecore_job_handler = NULL; 39 _ecore_job_handler = NULL;
52 eina_log_domain_unregister(_ecore_job_log_dom);
53 _ecore_job_log_dom = -1;
54 ecore_shutdown();
55
56 return _ecore_job_init_count;
57} 40}
58 41
59/** 42/**
diff --git a/legacy/ecore/src/lib/ecore/ecore_private.h b/legacy/ecore/src/lib/ecore/ecore_private.h
index 6347a6024b..34a5f58fd5 100644
--- a/legacy/ecore/src/lib/ecore/ecore_private.h
+++ b/legacy/ecore/src/lib/ecore/ecore_private.h
@@ -73,6 +73,7 @@ extern int _ecore_log_dom ;
73#define ECORE_MAGIC_POLLER 0xf7568127 73#define ECORE_MAGIC_POLLER 0xf7568127
74#define ECORE_MAGIC_PIPE 0xf7458226 74#define ECORE_MAGIC_PIPE 0xf7458226
75#define ECORE_MAGIC_WIN32_HANDLER 0xf7e8f1a3 75#define ECORE_MAGIC_WIN32_HANDLER 0xf7e8f1a3
76#define ECORE_MAGIC_JOB 0x76543210
76 77
77 78
78#define ECORE_MAGIC Ecore_Magic __magic 79#define ECORE_MAGIC Ecore_Magic __magic
@@ -190,6 +191,9 @@ void _ecore_thread_shutdown(void);
190void _ecore_glib_init(void); 191void _ecore_glib_init(void);
191void _ecore_glib_shutdown(void); 192void _ecore_glib_shutdown(void);
192 193
194void _ecore_job_init(void);
195void _ecore_job_shutdown(void);
196
193extern int _ecore_fps_debug; 197extern int _ecore_fps_debug;
194extern double _ecore_loop_time; 198extern double _ecore_loop_time;
195 199
diff --git a/legacy/ecore/src/lib/ecore_job/Ecore_Job.h b/legacy/ecore/src/lib/ecore_job/Ecore_Job.h
deleted file mode 100644
index 9276cfcaa2..0000000000
--- a/legacy/ecore/src/lib/ecore_job/Ecore_Job.h
+++ /dev/null
@@ -1,56 +0,0 @@
1/*
2 * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
3 */
4
5#ifndef _ECORE_JOB_H
6#define _ECORE_JOB_H
7
8#ifdef EAPI
9# undef EAPI
10#endif
11
12#ifdef _WIN32
13# ifdef EFL_ECORE_JOB_BUILD
14# ifdef DLL_EXPORT
15# define EAPI __declspec(dllexport)
16# else
17# define EAPI
18# endif /* ! DLL_EXPORT */
19# else
20# define EAPI __declspec(dllimport)
21# endif /* ! EFL_ECORE_JOB_BUILD */
22#else
23# ifdef __GNUC__
24# if __GNUC__ >= 4
25# define EAPI __attribute__ ((visibility("default")))
26# else
27# define EAPI
28# endif
29# else
30# define EAPI
31# endif
32#endif /* ! _WIN32 */
33
34/**
35 * @file
36 * @brief Functions for dealing with Ecore jobs.
37 */
38
39#ifdef __cplusplus
40extern "C" {
41#endif
42
43#ifndef _ECORE_JOB_PRIVATE_H
44typedef void Ecore_Job; /**< A job handle */
45#endif
46
47EAPI int ecore_job_init(void);
48EAPI int ecore_job_shutdown(void);
49EAPI Ecore_Job *ecore_job_add(void (*func) (void *data), const void *data);
50EAPI void *ecore_job_del(Ecore_Job *job);
51
52#ifdef __cplusplus
53}
54#endif
55
56#endif
diff --git a/legacy/ecore/src/lib/ecore_job/Makefile.am b/legacy/ecore/src/lib/ecore_job/Makefile.am
deleted file mode 100644
index 6116d707c4..0000000000
--- a/legacy/ecore/src/lib/ecore_job/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/ecore \
5-I$(top_builddir)/src/lib/ecore \
6@EFL_ECORE_JOB_BUILD@ \
7@EVIL_CFLAGS@ \
8@EINA_CFLAGS@
9
10AM_CFLAGS = @WIN32_CFLAGS@
11
12if BUILD_ECORE_JOB
13
14lib_LTLIBRARIES = libecore_job.la
15include_HEADERS = \
16Ecore_Job.h
17
18libecore_job_la_SOURCES = \
19ecore_job.c
20
21libecore_job_la_LIBADD = \
22$(top_builddir)/src/lib/ecore/libecore.la \
23@EINA_LIBS@ \
24@EVIL_LIBS@
25
26libecore_job_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @ecore_job_release_info@
27
28endif
29
30EXTRA_DIST = ecore_job_private.h
diff --git a/legacy/ecore/src/lib/ecore_job/ecore_job_private.h b/legacy/ecore/src/lib/ecore_job/ecore_job_private.h
deleted file mode 100644
index 8620626659..0000000000
--- a/legacy/ecore/src/lib/ecore_job/ecore_job_private.h
+++ /dev/null
@@ -1,47 +0,0 @@
1#ifndef _ECORE_JOB_PRIVATE_H
2#define _ECORE_JOB_PRIVATE_H
3
4#define ECORE_MAGIC_JOB 0x76543210
5
6extern int _ecore_job_log_dom;
7#ifdef ECORE_JOB_DEFAULT_LOG_COLOR
8# undef ECORE_JOB_DEFAULT_LOG_COLOR
9#endif
10#define ECORE_JOB_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
11
12#ifdef ERR
13# undef ERR
14#endif
15#define ERR(...) EINA_LOG_DOM_ERR(_ecore_job_log_dom, __VA_ARGS__)
16
17#ifdef DBG
18# undef DBG
19#endif
20#define DBG(...) EINA_LOG_DOM_DBG(_ecore_job_log_dom, __VA_ARGS__)
21
22#ifdef INF
23# undef INF
24#endif
25#define INF(...) EINA_LOG_DOM_INFO(_ecore_job_log_dom, __VA_ARGS__)
26
27#ifdef WRN
28# undef WRN
29#endif
30#define WRN(...) EINA_LOG_DOM_WARN(_ecore_job_log_dom, __VA_ARGS__)
31
32#ifdef CRIT
33# undef CRIT
34#endif
35#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_job_log_dom, __VA_ARGS__)
36
37typedef struct _Ecore_Job Ecore_Job;
38
39struct _Ecore_Job
40{
41 ECORE_MAGIC;
42 Ecore_Event *event;
43 void (*func) (void *data);
44 void *data;
45};
46
47#endif
diff --git a/legacy/edje/configure.ac b/legacy/edje/configure.ac
index 8725ceb60b..6e72123665 100644
--- a/legacy/edje/configure.ac
+++ b/legacy/edje/configure.ac
@@ -216,7 +216,6 @@ PKG_CHECK_MODULES([EDJE],
216 eet >= 1.2.3 216 eet >= 1.2.3
217 evas >= 0.9.9 217 evas >= 0.9.9
218 ecore >= 0.9.9 218 ecore >= 0.9.9
219 ecore-job >= 0.9.9
220 ecore-file >= 0.9.9 219 ecore-file >= 0.9.9
221 embryo >= 0.9.1 220 embryo >= 0.9.1
222 ]) 221 ])
@@ -224,7 +223,7 @@ PKG_CHECK_MODULES([EDJE],
224EDJE_LIBS="$EDJE_LIBS $LUA_LIBS" 223EDJE_LIBS="$EDJE_LIBS $LUA_LIBS"
225EDJE_CFLAGS="$EDJE_CFLAGS $LUA_CFLAGS" 224EDJE_CFLAGS="$EDJE_CFLAGS $LUA_CFLAGS"
226 225
227requirement_edje="embryo ecore-job ecore evas eet eina-0 ${requirement_edje}" 226requirement_edje="embryo ecore evas eet eina-0 ${requirement_edje}"
228requirement_edje="${requirement_lua} ${requirement_edje}" 227requirement_edje="${requirement_lua} ${requirement_edje}"
229 228
230have_ecore_imf="no" 229have_ecore_imf="no"
diff --git a/legacy/edje/src/lib/edje_main.c b/legacy/edje/src/lib/edje_main.c
index f7061c3276..43907b987b 100644
--- a/legacy/edje/src/lib/edje_main.c
+++ b/legacy/edje/src/lib/edje_main.c
@@ -34,13 +34,13 @@ Eina_Mempool *_edje_real_part_state_mp = NULL;
34 * 34 *
35 * This function initializes the ejde library, making the propers 35 * This function initializes the ejde library, making the propers
36 * calls to initialization functions. It makes calls to functions 36 * calls to initialization functions. It makes calls to functions
37 * eina_init(), ecore_job_init(), embryo_init() and eet_init() so 37 * eina_init(), ecore_init(), embryo_init() and eet_init() so
38 * there is no need to call those functions again in your code. To 38 * there is no need to call those functions again in your code. To
39 * shutdown edje there is a function edje_shutdown(). 39 * shutdown edje there is a function edje_shutdown().
40 * 40 *
41 * @see edje_shutdown() 41 * @see edje_shutdown()
42 * @see eina_init() 42 * @see eina_init()
43 * @see ecore_job_init() 43 * @see ecore_init()
44 * @see embryo_init() 44 * @see embryo_init()
45 * @see eet_init() 45 * @see eet_init()
46 * 46 *
@@ -67,16 +67,16 @@ edje_init(void)
67 goto shutdown_eina; 67 goto shutdown_eina;
68 } 68 }
69 69
70 if (!ecore_job_init()) 70 if (!ecore_init())
71 { 71 {
72 ERR("Edje: Ecore_Job init failed"); 72 ERR("Edje: Ecore init failed");
73 goto unregister_log_domain; 73 goto unregister_log_domain;
74 } 74 }
75 75
76 if (!embryo_init()) 76 if (!embryo_init())
77 { 77 {
78 ERR("Edje: Embryo init failed"); 78 ERR("Edje: Embryo init failed");
79 goto shutdown_ecore_job; 79 goto shutdown_ecore;
80 } 80 }
81 81
82 if (!eet_init()) 82 if (!eet_init())
@@ -131,8 +131,8 @@ edje_init(void)
131 eet_shutdown(); 131 eet_shutdown();
132 shutdown_embryo: 132 shutdown_embryo:
133 embryo_shutdown(); 133 embryo_shutdown();
134 shutdown_ecore_job: 134 shutdown_ecore:
135 ecore_job_shutdown(); 135 ecore_shutdown();
136 unregister_log_domain: 136 unregister_log_domain:
137 eina_log_domain_unregister(_edje_default_log_dom); 137 eina_log_domain_unregister(_edje_default_log_dom);
138 _edje_default_log_dom = -1; 138 _edje_default_log_dom = -1;
@@ -148,13 +148,13 @@ edje_init(void)
148 * shutdown. 148 * shutdown.
149 * 149 *
150 * This function shuts down the edje library. It calls the functions 150 * This function shuts down the edje library. It calls the functions
151 * eina_shutdown(), ecore_job_shutdown(), embryo_shutdown() and 151 * eina_shutdown(), ecore_shutdown(), embryo_shutdown() and
152 * eet_shutdown(), so there is no need to call these functions again 152 * eet_shutdown(), so there is no need to call these functions again
153 * in your code. 153 * in your code.
154 * 154 *
155 * @see edje_init() 155 * @see edje_init()
156 * @see eina_shutdown() 156 * @see eina_shutdown()
157 * @see ecore_job_shutdown() 157 * @see ecore_shutdown()
158 * @see embryo_shutdown() 158 * @see embryo_shutdown()
159 * @see eet_shutdown() 159 * @see eet_shutdown()
160 * 160 *
@@ -190,7 +190,7 @@ edje_shutdown(void)
190 190
191 eet_shutdown(); 191 eet_shutdown();
192 embryo_shutdown(); 192 embryo_shutdown();
193 ecore_job_shutdown(); 193 ecore_shutdown();
194 eina_log_domain_unregister(_edje_default_log_dom); 194 eina_log_domain_unregister(_edje_default_log_dom);
195 _edje_default_log_dom = -1; 195 _edje_default_log_dom = -1;
196 eina_shutdown(); 196 eina_shutdown();
diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h
index 79428392a8..30783bc875 100644
--- a/legacy/edje/src/lib/edje_private.h
+++ b/legacy/edje/src/lib/edje_private.h
@@ -13,7 +13,6 @@
13#include <Evas.h> 13#include <Evas.h>
14#include <Ecore.h> 14#include <Ecore.h>
15#include <Ecore_Str.h> 15#include <Ecore_Str.h>
16#include <Ecore_Job.h>
17#ifdef HAVE_ECORE_IMF 16#ifdef HAVE_ECORE_IMF
18# include <Ecore_IMF.h> 17# include <Ecore_IMF.h>
19#endif 18#endif
diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index 52854f181e..9f8b29a491 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -79,8 +79,8 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
79 79
80### Checks for libraries 80### Checks for libraries
81 81
82PKG_CHECK_MODULES(EMOTION, [eina-0 evas >= 0.9.9 ecore >= 0.9.9 ecore-job >= 0.9.9]) 82PKG_CHECK_MODULES(EMOTION, [eina-0 evas >= 0.9.9 ecore >= 0.9.9])
83requirement_emotion="ecore-job ecore evas eina-0" 83requirement_emotion="ecore evas eina-0"
84 84
85PKG_CHECK_MODULES(EMOTION_BIN, [evas >= 0.9.9 ecore >= 0.9.9 ecore-evas >= 0.9.9 edje >= 0.5.0]) 85PKG_CHECK_MODULES(EMOTION_BIN, [evas >= 0.9.9 ecore >= 0.9.9 ecore-evas >= 0.9.9 edje >= 0.5.0])
86 86
diff --git a/legacy/emotion/src/lib/emotion_private.h b/legacy/emotion/src/lib/emotion_private.h
index adf1f255d2..1af4079ebe 100644
--- a/legacy/emotion/src/lib/emotion_private.h
+++ b/legacy/emotion/src/lib/emotion_private.h
@@ -11,7 +11,6 @@
11 11
12#include <Evas.h> 12#include <Evas.h>
13#include <Ecore.h> 13#include <Ecore.h>
14#include <Ecore_Job.h>
15#include <Ecore_Str.h> 14#include <Ecore_Str.h>
16#include <Emotion.h> 15#include <Emotion.h>
17 16
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index ba733f2fbb..e724f8e47e 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -227,7 +227,7 @@ emotion_object_init(Evas_Object *obj, const char *module_filename)
227 sd->seek_pos = 0; 227 sd->seek_pos = 0;
228 sd->len = 0; 228 sd->len = 0;
229 229
230 ecore_job_init(); 230 ecore_init();
231 231
232 if ((!sd->module) || (!sd->video)) 232 if ((!sd->module) || (!sd->video))
233 { 233 {
@@ -1313,7 +1313,7 @@ _smart_del(Evas_Object * obj)
1313 free(sd->ref.file); 1313 free(sd->ref.file);
1314 free(sd); 1314 free(sd);
1315 1315
1316 ecore_job_shutdown(); 1316 ecore_shutdown();
1317} 1317}
1318 1318
1319static void 1319static void