init ecore in main init

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/efreet@54781 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/efreet.c b/src/lib/efreet.c
index 636214e..d1d42c3 100644 (file)
--- a/src/lib/efreet.c
+++ b/src/lib/efreet.c
@@ -34,8 +34,10 @@ efreet_init(void)
 
     if (!eina_init())
         return --_efreet_init_count;
-    if (!eet_init())
+    if (!ecore_init())
         goto shutdown_eina;
+    if (!eet_init())
+        goto shutdown_ecore;
     _efreet_log_domain_global = eina_log_domain_register("efreet", EFREET_DEFAULT_LOG_COLOR);
     if (_efreet_log_domain_global < 0)
     {
@@ -91,6 +93,8 @@ unregister_log_domain:
     eina_log_domain_unregister(_efreet_log_domain_global);
 shutdown_eet:
     eet_shutdown();
+shutdown_ecore:
+    ecore_shutdown();
 shutdown_eina:
     eina_shutdown();
 

diff --git a/src/lib/efreet_icon.c b/src/lib/efreet_icon.c
index 789209d..53cc6b9 100644 (file)
--- a/src/lib/efreet_icon.c
+++ b/src/lib/efreet_icon.c
@@ -118,16 +118,10 @@ efreet_icon_init(void)
         const char *default_exts[] = {".png", ".xpm", NULL};
         int i;
 
-        if (!ecore_init())
-            return 0;
-
         _efreet_icon_log_dom = eina_log_domain_register
             ("efreet_icon", EFREET_DEFAULT_LOG_COLOR);
         if (_efreet_icon_log_dom < 0)
-        {
-            ecore_shutdown();
             return 0;
-        }
 
         /* setup the default extension list */
         for (i = 0; default_exts[i]; i++)