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:42:17 +0200
commitaee73ce08632072380256bd91f2e3e89a6e3df7b (patch)
treed35bf331ebc6f5da0a7725bb4612cd774e004946
parentafb76a881d77ca3deb24100af85c5995e4dcb0e6 (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 03ce851e6e..bfcf72b943 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 *
1561 1561
1562 if (!parent || !xml) return 0; 1562 if (!parent || !xml) return 0;
1563 1563
1564 if (!strcmp(efreet_menu_prefix, "gnome-") && 1564 if (!strcmp(parent->file.name, "gnome-applications.menu"))
1565 (!strcmp(parent->file.name, "gnome-applications.menu")))
1566 { 1565 {
1567 p = alloca(sizeof("applications")); 1566 p = alloca(sizeof("applications"));
1568 memcpy(p, "applications", sizeof("applications")); 1567 memcpy(p, "applications", sizeof("applications"));
1569 } 1568 }
1570 else if ((!strcmp(efreet_menu_prefix, "kde-") && 1569 else if (!strcmp(parent->file.name, "kde-applications.menu"))
1571 (!strcmp(parent->file.name, "kde-applications.menu"))))
1572 { 1570 {
1573 p = alloca(sizeof("applications")); 1571 p = alloca(sizeof("applications"));
1574 memcpy(p, "applications", sizeof("applications")); 1572 memcpy(p, "applications", sizeof("applications"));