[elm_main.c, elm_config.c] Merge upstream source about elm_config preload issue

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index fefd22b..974749b 100644 (file)
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1464,11 +1464,6 @@ _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 77bb3bf..2496ae1 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -401,7 +401,6 @@ elm_quicklaunch_init(int    argc,
    if (!_elm_data_dir) _elm_data_dir = eina_stringshare_add("/");
    if (!_elm_lib_dir) _elm_lib_dir = eina_stringshare_add("/");
 
-   _elm_config_init();
    return _elm_ql_init_count;
 }
 
@@ -413,6 +412,7 @@ elm_quicklaunch_sub_init(int    argc,
    if (_elm_sub_init_count > 1) return _elm_sub_init_count;
    if (quicklaunch_on)
      {
+        _elm_config_init();
 #ifdef SEMI_BROKEN_QUICKLAUNCH
         return _elm_sub_init_count;
 #endif
@@ -423,6 +423,7 @@ elm_quicklaunch_sub_init(int    argc,
         evas_init();
         edje_init();
         _elm_module_init();
+        _elm_config_init();
         _elm_config_sub_init();
         ecore_evas_init(); // FIXME: check errors
 #ifdef HAVE_ELEMENTARY_ECORE_IMF