thanatermesis pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5d1e33351e241ab565439a36e3db2d14d34fac3a
commit 5d1e33351e241ab565439a36e3db2d14d34fac3a Author: Sebastian Dransfeld <[email protected]> Date: Wed Jun 11 10:43:26 2014 +0200 e: rename applications menu to fit xdg menu spec (cherry picked from commit 3b899f44fe7dc3aba186a53d46f5a58255d1341f) Conflicts: data/etc/Makefile.mk --- data/etc/Makefile.am | 2 +- data/etc/{enlightenment.menu => e-applications.menu} | 0 src/bin/e_order.c | 4 ++-- src/modules/conf_menus/e_int_config_menus.c | 2 +- src/modules/wizard/page_030.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/etc/Makefile.am b/data/etc/Makefile.am index 2c50f01..50df292 100644 --- a/data/etc/Makefile.am +++ b/data/etc/Makefile.am @@ -10,7 +10,7 @@ menusdir = $(sysconfdir)/xdg/menus menus_DATA = if INSTALL_ENLIGHTENMENT_MENU -menus_DATA += enlightenment.menu +menus_DATA += e-applications.menu endif EXTRA_DIST = $(files_DATA) $(menus_DATA) diff --git a/data/etc/enlightenment.menu b/data/etc/e-applications.menu similarity index 100% rename from data/etc/enlightenment.menu rename to data/etc/e-applications.menu diff --git a/src/bin/e_order.c b/src/bin/e_order.c index 6f2d61d..d13b8e1 100644 --- a/src/bin/e_order.c +++ b/src/bin/e_order.c @@ -32,12 +32,12 @@ e_order_init(void) char buf[PATH_MAX]; E_FREE(menu_file); - snprintf(buf, sizeof(buf), "/etc/xdg/menus/enlightenment.menu"); + snprintf(buf, sizeof(buf), "/etc/xdg/menus/e-applications.menu"); if (ecore_file_exists(buf)) menu_file = strdup(buf); else { snprintf(buf, sizeof(buf), - "%s/etc/xdg/menus/enlightenment.menu", + "%s/etc/xdg/menus/e-applications.menu", e_prefix_get()); if (ecore_file_exists(buf)) menu_file = strdup(buf); } diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c index 8d504cd..4b32114 100644 --- a/src/modules/conf_menus/e_int_config_menus.c +++ b/src/modules/conf_menus/e_int_config_menus.c @@ -163,7 +163,7 @@ _create_menus_list(Evas *evas, E_Config_Dialog_Data *cfdata) tdesc = NULL; e_user_homedir_concat(buf, sizeof(buf), ".config/menus/applications.menu"); - snprintf(buf2, sizeof(buf2), "%s/etc/xdg/menus/enlightenment.menu", + snprintf(buf2, sizeof(buf2), "%s/etc/xdg/menus/e-applications.menu", e_prefix_get()); if (!strcmp("/etc/xdg/menus/applications.menu", file)) { diff --git a/src/modules/wizard/page_030.c b/src/modules/wizard/page_030.c index 7346f8b..a878b7c 100644 --- a/src/modules/wizard/page_030.c +++ b/src/modules/wizard/page_030.c @@ -18,7 +18,7 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__) { char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "%s/etc/xdg/menus/enlightenment.menu", + snprintf(buf, sizeof(buf), "%s/etc/xdg/menus/e-applications.menu", e_prefix_get()); e_config->default_system_menu = eina_stringshare_add(buf); return 0; /* 1 == show ui, and wait for user, 0 == just continue */ --
