kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
(cherry picked from commit ffda8635fe)

Signed-off-by: Thanatermesis <thanatermesis@gmail.com>
This commit is contained in:
Sebastian Dransfeld 2014-06-10 13:44:58 +02:00 committed by Thanatermesis
parent afb76a881d
commit aee73ce086
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/efreet/efreet_menu.c
View File

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