move config load to sub init and sub init to after launch request to

pick up config changes for quicklaunch

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

diff --git a/src/bin/quicklaunch.c b/src/bin/quicklaunch.c
index fd1ed7c..c9e6de9 100644 (file)
--- a/src/bin/quicklaunch.c
+++ b/src/bin/quicklaunch.c
@@ -266,10 +266,11 @@ main(int argc, char **argv)
        struct sockaddr_un client;
        socklen_t len;
 
-       elm_quicklaunch_sub_init(argc, argv);
-       elm_quicklaunch_seed();
        len = sizeof(struct sockaddr_un);
        fd = accept(sock, (struct sockaddr *)&client, &len);
+       elm_quicklaunch_sub_init(argc, argv);
+// don't seed since we are doing this AFTER launch request        
+//     elm_quicklaunch_seed();
        if (fd >= 0)
          {
             unsigned long bytes;

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 9a56c31..372dcc8 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