elementary/main - elm_config_sub_shutdown is more sensible and removed duplicated...

SVN revision: 63649

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 591f6b7..a6c76f3 100644 (file)
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1691,6 +1691,22 @@ _elm_config_init(void)
 }
 
 void
+_elm_config_sub_shutdown(void)
+{
+#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
+   if (ENGINE_COMPARE(ELM_SOFTWARE_X11) ||
+       ENGINE_COMPARE(ELM_SOFTWARE_16_X11) ||
+       ENGINE_COMPARE(ELM_XRENDER_X11) ||
+       ENGINE_COMPARE(ELM_OPENGL_X11))
+#undef ENGINE_COMPARE
+     {
+#ifdef HAVE_ELEMENTARY_X
+        ecore_x_disconnect();
+#endif
+     }
+}
+
+void
 _elm_config_sub_init(void)
 {
 #define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 6959bdb..db0ba7d 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -421,17 +421,6 @@ elm_quicklaunch_sub_init(int    argc,
         edje_init();
         _elm_module_init();
         _elm_config_sub_init();
-#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
-        if (ENGINE_COMPARE(ELM_SOFTWARE_X11) ||
-            ENGINE_COMPARE(ELM_SOFTWARE_16_X11) ||
-            ENGINE_COMPARE(ELM_XRENDER_X11) ||
-            ENGINE_COMPARE(ELM_OPENGL_X11))
-#undef ENGINE_COMPARE
-          {
-#ifdef HAVE_ELEMENTARY_X
-             ecore_x_init(NULL);
-#endif
-          }
         ecore_evas_init(); // FIXME: check errors
         ecore_imf_init();
         ecore_con_init();
@@ -459,17 +448,7 @@ elm_quicklaunch_sub_shutdown(void)
         ecore_con_shutdown();
         ecore_imf_shutdown();
         ecore_evas_shutdown();
-#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
-        if (ENGINE_COMPARE(ELM_SOFTWARE_X11) ||
-            ENGINE_COMPARE(ELM_SOFTWARE_16_X11) ||
-            ENGINE_COMPARE(ELM_XRENDER_X11) ||
-            ENGINE_COMPARE(ELM_OPENGL_X11))
-#undef ENGINE_COMPARE
-          {
-#ifdef HAVE_ELEMENTARY_X
-             ecore_x_disconnect();
-#endif
-          }
+        _elm_config_sub_shutdown();
 #define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
         if (ENGINE_COMPARE(ELM_SOFTWARE_X11) ||
             ENGINE_COMPARE(ELM_SOFTWARE_16_X11) ||

diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index e6ff20b..81ad807 100644 (file)
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -200,6 +200,7 @@ void                _elm_widget_mirrored_reload(Evas_Object *obj);
 void                _elm_config_init(void);
 void                _elm_config_sub_init(void);
 void                _elm_config_shutdown(void);
+void                _elm_config_sub_shutdown(void);
 Eina_Bool           _elm_config_save(void);
 void                _elm_config_reload(void);