diff options
| author | Sebastian Dransfeld <sd@tango.flipp.net> | 2014-06-11 10:43:26 +0200 |
|---|---|---|
| committer | Thanatermesis <thanatermesis@gmail.com> | 2014-06-12 16:41:56 +0200 |
| commit | 5d1e33351e241ab565439a36e3db2d14d34fac3a (patch) | |
| tree | 4030e060626894e1b1cb6d0092d997545b0bbfb2 | |
| parent | a2b3c6c837be5bc4b95cb4f64fddc95a03aff2d0 (diff) | |
| download | enlightenment-5d1e33351e241ab565439a36e3db2d14d34fac3a.tar.gz | |
e: rename applications menu to fit xdg menu spec
(cherry picked from commit 3b899f44fe7dc3aba186a53d46f5a58255d1341f)
Conflicts:
data/etc/Makefile.mk
| -rw-r--r-- | data/etc/Makefile.am | 2 | ||||
| -rw-r--r-- | data/etc/e-applications.menu (renamed from data/etc/enlightenment.menu) | 0 | ||||
| -rw-r--r-- | src/bin/e_order.c | 4 | ||||
| -rw-r--r-- | src/modules/conf_menus/e_int_config_menus.c | 2 | ||||
| -rw-r--r-- | 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 2c50f01660..50df292896 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 index eb87cdf2a4..eb87cdf2a4 100644 --- a/data/etc/enlightenment.menu +++ b/data/etc/e-applications.menu diff --git a/src/bin/e_order.c b/src/bin/e_order.c index 6f2d61df59..d13b8e131e 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 8d504cde10..4b321149e0 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 7346f8b2d9..a878b7cfb9 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 */ |