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

e: rename applications menu to fit xdg menu spec

This commit is contained in:
Sebastian Dransfeld 2014-06-11 10:43:26 +02:00
parent 25741f93fa
commit 3b899f44fe
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.mk
View File

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

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

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

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