e: rename applications menu to fit xdg menu spec
This commit is contained in:
parent
25741f93fa
commit
3b899f44fe
|
@ -9,7 +9,7 @@ etcmenusdir = $(sysconfdir)/xdg/menus
|
||||||
etcmenus_DATA =
|
etcmenus_DATA =
|
||||||
|
|
||||||
if INSTALL_ENLIGHTENMENT_MENU
|
if INSTALL_ENLIGHTENMENT_MENU
|
||||||
etcmenus_DATA += data/etc/enlightenment.menu
|
etcmenus_DATA += data/etc/e-applications.menu
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_DIST += $(etcfiles_DATA) $(etcmenus_DATA)
|
EXTRA_DIST += $(etcfiles_DATA) $(etcmenus_DATA)
|
||||||
|
|
|
@ -32,12 +32,12 @@ e_order_init(void)
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
|
|
||||||
E_FREE(menu_file);
|
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);
|
if (ecore_file_exists(buf)) menu_file = strdup(buf);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
snprintf(buf, sizeof(buf),
|
snprintf(buf, sizeof(buf),
|
||||||
"%s/etc/xdg/menus/enlightenment.menu",
|
"%s/etc/xdg/menus/e-applications.menu",
|
||||||
e_prefix_get());
|
e_prefix_get());
|
||||||
if (ecore_file_exists(buf)) menu_file = strdup(buf);
|
if (ecore_file_exists(buf)) menu_file = strdup(buf);
|
||||||
}
|
}
|
||||||
|
|
|
@ -163,7 +163,7 @@ _create_menus_list(Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||||
tdesc = NULL;
|
tdesc = NULL;
|
||||||
e_user_homedir_concat(buf, sizeof(buf),
|
e_user_homedir_concat(buf, sizeof(buf),
|
||||||
".config/menus/applications.menu");
|
".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());
|
e_prefix_get());
|
||||||
if (!strcmp("/etc/xdg/menus/applications.menu", file))
|
if (!strcmp("/etc/xdg/menus/applications.menu", file))
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,7 +18,7 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
|
||||||
{
|
{
|
||||||
char buf[PATH_MAX];
|
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_prefix_get());
|
||||||
e_config->default_system_menu = eina_stringshare_add(buf);
|
e_config->default_system_menu = eina_stringshare_add(buf);
|
||||||
return 0; /* 1 == show ui, and wait for user, 0 == just continue */
|
return 0; /* 1 == show ui, and wait for user, 0 == just continue */
|
||||||
|
|
Loading…
Reference in New Issue