From a19c9689731e194edd2a2bc7e0bca98f6f4bac90 Mon Sep 17 00:00:00 2001
From: Alastair Poole <netstar@gmail.com>
Date: Thu, 3 Jan 2019 18:37:17 +0000
Subject: [PATCH] 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
---
 src/bin/e_main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 73be9f84d..8a2157821 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -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())
      {