* ecore: Move ecore_job inside ecore.

	Patch from Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com>.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/emotion@45570 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 52854f1..9f8b29a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -79,8 +79,8 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
 
 ### Checks for libraries
 
-PKG_CHECK_MODULES(EMOTION, [eina-0 evas >= 0.9.9 ecore >= 0.9.9 ecore-job >= 0.9.9])
-requirement_emotion="ecore-job ecore evas eina-0"
+PKG_CHECK_MODULES(EMOTION, [eina-0 evas >= 0.9.9 ecore >= 0.9.9])
+requirement_emotion="ecore evas eina-0"
 
 PKG_CHECK_MODULES(EMOTION_BIN, [evas >= 0.9.9 ecore >= 0.9.9 ecore-evas >= 0.9.9 edje >= 0.5.0])
 

diff --git a/src/lib/emotion_private.h b/src/lib/emotion_private.h
index adf1f25..1af4079 100644 (file)
--- a/src/lib/emotion_private.h
+++ b/src/lib/emotion_private.h
@@ -11,7 +11,6 @@
 
 #include <Evas.h>
 #include <Ecore.h>
-#include <Ecore_Job.h>
 #include <Ecore_Str.h>
 #include <Emotion.h>
 

diff --git a/src/lib/emotion_smart.c b/src/lib/emotion_smart.c
index ba733f2..e724f8e 100644 (file)
--- a/src/lib/emotion_smart.c
+++ b/src/lib/emotion_smart.c
@@ -227,7 +227,7 @@ emotion_object_init(Evas_Object *obj, const char *module_filename)
    sd->seek_pos = 0;
    sd->len = 0;
 
-   ecore_job_init();
+   ecore_init();
 
    if ((!sd->module) || (!sd->video))
      {
@@ -1313,7 +1313,7 @@ _smart_del(Evas_Object * obj)
    free(sd->ref.file);
    free(sd);
 
-   ecore_job_shutdown();
+   ecore_shutdown();
 }
 
 static void