forked from enlightenment/efl
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:
parent
afb76a881d
commit
aee73ce086
|
@ -1561,14 +1561,12 @@ efreet_menu_handle_default_merge_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *
|
||||||
|
|
||||||
if (!parent || !xml) return 0;
|
if (!parent || !xml) return 0;
|
||||||
|
|
||||||
if (!strcmp(efreet_menu_prefix, "gnome-") &&
|
if (!strcmp(parent->file.name, "gnome-applications.menu"))
|
||||||
(!strcmp(parent->file.name, "gnome-applications.menu")))
|
|
||||||
{
|
{
|
||||||
p = alloca(sizeof("applications"));
|
p = alloca(sizeof("applications"));
|
||||||
memcpy(p, "applications", sizeof("applications"));
|
memcpy(p, "applications", sizeof("applications"));
|
||||||
}
|
}
|
||||||
else if ((!strcmp(efreet_menu_prefix, "kde-") &&
|
else if (!strcmp(parent->file.name, "kde-applications.menu"))
|
||||||
(!strcmp(parent->file.name, "kde-applications.menu"))))
|
|
||||||
{
|
{
|
||||||
p = alloca(sizeof("applications"));
|
p = alloca(sizeof("applications"));
|
||||||
memcpy(p, "applications", sizeof("applications"));
|
memcpy(p, "applications", sizeof("applications"));
|
||||||
|
|
Loading…
Reference in New Issue