fix openGL issue - cannot load the enviroment variable

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 974749b..fefd22b 100644 (file)
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1464,6 +1464,11 @@ _elm_config_sub_shutdown(void)
 void
 _elm_config_sub_init(void)
 {
+   // NOTE: Do not merge upstream code. Just leave it.
+   _env_get();
+   _config_apply();
+   _elm_config_font_overlay_apply();
+   _elm_recache();
 #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_main.c b/src/lib/elm_main.c
index ea0603b..77bb3bf 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -424,17 +424,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
 #ifdef HAVE_ELEMENTARY_ECORE_IMF
         ecore_imf_init();