kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

pick up config changes for quicklaunch



SVN revision: 68250
This commit is contained in:
Carsten Haitzler 2012-02-22 08:54:34 +00:00
parent 548f616eae
commit 931a64c939
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/elementary/src/bin/quicklaunch.c
View File

@ -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;

3
legacy/elementary/src/lib/elm_main.c
View File

@ -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