From: Sebastian Dransfeld <sd@tango.flipp.net>
Date: Tue, 10 Jun 2014 11:44:58 +0000 (+0200)
Subject: efreet: Correctly handle default merge dir
X-Git-Tag: upstream/1.10.0+1149+ga3a15b1~647
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ffda8635fe8d7140c28044d0affc64697f1eb550;p=platform%2Fupstream%2Fefl.git

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
---

diff --git a/src/lib/efreet/efreet_menu.c b/src/lib/efreet/efreet_menu.c
index 03ce851..bfcf72b 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 *
 
     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"));