thanatermesis pushed a commit to branch efl-1.9.

http://git.enlightenment.org/core/efl.git/commit/?id=f309703d2375bb9ac3ab7f66e30b2ee262e4d060

commit f309703d2375bb9ac3ab7f66e30b2ee262e4d060
Author: Sebastian Dransfeld <s...@tango.flipp.net>
Date:   Wed Jun 11 10:59:09 2014 +0200

    efreet: remove code duplication
    
    If the menu starts with either kde- or gnome- the resulting action is
    the same.
    (cherry picked from commit a10d4167f11074f338f9d8cf6f8f8023fc438b05)
    
    Signed-off-by: Thanatermesis <thanaterme...@gmail.com>
---
 src/lib/efreet/efreet_menu.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/lib/efreet/efreet_menu.c b/src/lib/efreet/efreet_menu.c
index d684137..29c89d6 100644
--- a/src/lib/efreet/efreet_menu.c
+++ b/src/lib/efreet/efreet_menu.c
@@ -1562,12 +1562,8 @@ 
efreet_menu_handle_default_merge_dirs(Efreet_Menu_Internal *parent, Efreet_Xml *
 
     if (!parent || !xml) return 0;
 
-    if (!strcmp(parent->file.name, "gnome-applications.menu"))
-    {
-        p = alloca(sizeof("applications"));
-        memcpy(p, "applications", sizeof("applications"));
-    }
-    else if (!strcmp(parent->file.name, "kde-applications.menu"))
+    if ((!strcmp(parent->file.name, "gnome-applications.menu")) ||
+        (!strcmp(parent->file.name, "kde-applications.menu")))
     {
         p = alloca(sizeof("applications"));
         memcpy(p, "applications", sizeof("applications"));

-- 


Reply via email to