enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

e_main: initialise XDG environment earlier. 

Summary:
Moving _xdg_data_dirs_augment call to earlier in
initalisation process. Currently first-run will
leave XDG_MENU_PREFIX broken, thus the application
menu will be empty in E.

Seems eio_init might be the culprit.

Moved to above eio_init.

Test Plan:
* Launch E from X from a console (startx)
* Check application menu (empty).
* Apply patch.
* Launch E from X from a console (startx)
* E's Application menu should be populated.

Related to https://phab.enlightenment.org/D7534

Reviewers: #committers, raster, cedric, zmike, devilhorns

Reviewed By: #committers, zmike

Tags: #enlightenment-git

Differential Revision: https://phab.enlightenment.org/D7535
This commit is contained in:
Alastair Poole 2019-01-03 18:37:17 +00:00
parent 72dbbced1a
commit a19c968973
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_main.c
View File

@ -380,6 +380,10 @@ main(int argc, char **argv)
TS("EFX Init Done");
_e_main_shutdown_push((void*)e_efx_shutdown);
/* Eio's eio_init internally calls efreet_init. Set XDG_MENU_PREFIX here */
/* else efreet's efreet_menu_prefix symbol is set erroneously during eio_init. */
_xdg_data_dirs_augment();
TS("EIO Init");
if (!eio_init())
{
@ -444,8 +448,6 @@ main(int argc, char **argv)
_idle_before = ecore_idle_enterer_before_add(_e_main_cb_idle_before, NULL);
_xdg_data_dirs_augment();
TS("Ecore_Evas Init");
if (!ecore_evas_init())
{