englebass pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ffda8635fe8d7140c28044d0affc64697f1eb550
commit ffda8635fe8d7140c28044d0affc64697f1eb550 Author: Sebastian Dransfeld <[email protected]> Date: Tue Jun 10 13:44:58 2014 +0200 efreet: Correctly handle default merge dir When main menu file is gnome-applications.menu or kde-applications.menu, we should be using applications as base for merged dir. Part of T1284 --- src/lib/efreet/efreet_menu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/efreet/efreet_menu.c b/src/lib/efreet/efreet_menu.c index 03ce851..bfcf72b 100644 --- a/src/lib/efreet/efreet_menu.c +++ b/src/lib/efreet/efreet_menu.c @@ -1561,14 +1561,12 @@ efreet_menu_handle_default_merge_dirs(Efreet_Menu_Internal *parent, Efreet_Xml * if (!parent || !xml) return 0; - if (!strcmp(efreet_menu_prefix, "gnome-") && - (!strcmp(parent->file.name, "gnome-applications.menu"))) + if (!strcmp(parent->file.name, "gnome-applications.menu")) { p = alloca(sizeof("applications")); memcpy(p, "applications", sizeof("applications")); } - else if ((!strcmp(efreet_menu_prefix, "kde-") && - (!strcmp(parent->file.name, "kde-applications.menu")))) + else if (!strcmp(parent->file.name, "kde-applications.menu")) { p = alloca(sizeof("applications")); memcpy(p, "applications", sizeof("applications")); --
