summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2014-06-11 10:59:09 +0200
committerThanatermesis <thanatermesis@gmail.com>2014-06-12 15:42:17 +0200
commitf309703d2375bb9ac3ab7f66e30b2ee262e4d060 (patch)
treef63e13753d0c3838fe94e932cd5dfbd8ba8f0196
parentfecdca678ca99ba978f8ec141118d5956e213fa7 (diff)
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 <thanatermesis@gmail.com>
-rw-r--r--src/lib/efreet/efreet_menu.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/efreet/efreet_menu.c b/src/lib/efreet/efreet_menu.c
index d6841378ee..29c89d60d3 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 *
1562 1562
1563 if (!parent || !xml) return 0; 1563 if (!parent || !xml) return 0;
1564 1564
1565 if (!strcmp(parent->file.name, "gnome-applications.menu")) 1565 if ((!strcmp(parent->file.name, "gnome-applications.menu")) ||
1566 { 1566 (!strcmp(parent->file.name, "kde-applications.menu")))
1567 p = alloca(sizeof("applications"));
1568 memcpy(p, "applications", sizeof("applications"));
1569 }
1570 else if (!strcmp(parent->file.name, "kde-applications.menu"))
1571 { 1567 {
1572 p = alloca(sizeof("applications")); 1568 p = alloca(sizeof("applications"));
1573 memcpy(p, "applications", sizeof("applications")); 1569 memcpy(p, "applications", sizeof("applications"));