diff --git a/data/etc/Makefile.mk b/data/etc/Makefile.mk index 8fc86d8ee..84e90a341 100644 --- a/data/etc/Makefile.mk +++ b/data/etc/Makefile.mk @@ -9,7 +9,7 @@ etcmenusdir = $(sysconfdir)/xdg/menus etcmenus_DATA = if INSTALL_ENLIGHTENMENT_MENU -etcmenus_DATA += data/etc/enlightenment.menu +etcmenus_DATA += data/etc/e-applications.menu endif EXTRA_DIST += $(etcfiles_DATA) $(etcmenus_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 6f2d61df5..d13b8e131 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 bc422018d..14049ac90 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 7346f8b2d..a878b7cfb 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 */