summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2014-06-10 13:44:58 +0200
committerThanatermesis <thanatermesis@gmail.com>2014-06-12 15:44:09 +0200
commit8096976d60998654f18ead51154908492d0ac4ac (patch)
tree742c9e6a369c024d92f3b678dbc744885990f91f
parentfd7c86385446b966d1bb9a93d65a2494b8b78621 (diff)
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 ffda8635fe8d7140c28044d0affc64697f1eb550) Signed-off-by: Thanatermesis <thanatermesis@gmail.com>
-rw-r--r--src/lib/efreet/efreet_menu.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/efreet/efreet_menu.c b/src/lib/efreet/efreet_menu.c
index dd56ad6033..b0e27467da 100644
--- a/src/lib/efreet/efreet_menu.c
+++ b/src/lib/efreet/efreet_menu.c
@@ -1557,14 +1557,12 @@ efreet_menu_handle_default_merge_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *
1557 1557
1558 if (!parent || !xml) return 0; 1558 if (!parent || !xml) return 0;
1559 1559
1560 if (!strcmp(efreet_menu_prefix, "gnome-") && 1560 if (!strcmp(parent->file.name, "gnome-applications.menu"))
1561 (!strcmp(parent->file.name, "gnome-applications.menu")))
1562 { 1561 {
1563 p = alloca(sizeof("applications")); 1562 p = alloca(sizeof("applications"));
1564 memcpy(p, "applications", sizeof("applications")); 1563 memcpy(p, "applications", sizeof("applications"));
1565 } 1564 }
1566 else if ((!strcmp(efreet_menu_prefix, "kde-") && 1565 else if (!strcmp(parent->file.name, "kde-applications.menu"))
1567 (!strcmp(parent->file.name, "kde-applications.menu"))))
1568 { 1566 {
1569 p = alloca(sizeof("applications")); 1567 p = alloca(sizeof("applications"));
1570 memcpy(p, "applications", sizeof("applications")); 1568 memcpy(p, "applications", sizeof("applications"));