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

e: rename applications menu to fit xdg menu spec 

Backported by Thanatermesis for E17:

Conflicts:
	data/etc/Makefile.mk

Fixed the old Makefile.am one instead
This commit is contained in:
Sebastian Dransfeld 2014-06-11 10:43:26 +02:00 committed by Thanatermesis
parent cae503d4d1
commit 9195d17b47
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/etc/Makefile.am
View File

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

0
data/etc/enlightenment.menu → data/etc/e-applications.menu
View File

4
src/bin/e_order.c
View File

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

2
src/modules/conf_menus/e_int_config_menus.c
View File

@ -162,7 +162,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))
{

2
src/modules/wizard/page_030.c
View File

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