diff options
author | Sebastian Dransfeld <sd@tango.flipp.net> | 2014-06-10 13:44:58 +0200 |
---|---|---|
committer | Sebastian Dransfeld <sd@tango.flipp.net> | 2014-06-10 13:46:49 +0200 |
commit | ffda8635fe8d7140c28044d0affc64697f1eb550 (patch) | |
tree | 36a609ae123c8a8115616d4933d97a2038a1cf8f /src | |
parent | 03983be6870b29ca0068f81690b05535db28c505 (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
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/efreet/efreet_menu.c | 6 |
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")); |