From 9c90f80ff1232d6ff2512317a5fbd4897c440c75 Mon Sep 17 00:00:00 2001
From: o9000 <o9000>
Date: Fri, 7 Oct 2011 08:23:04 +0000
Subject: [PATCH] Fixed launcher behavior for .desktop files with multiple
 shortcut groups; fixed launcher memory leak

git-svn-id: http://tint2.googlecode.com/svn/trunk@640 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
---
 src/launcher/launcher.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c
index ef007ec..a813fea 100644
--- a/src/launcher/launcher.c
+++ b/src/launcher/launcher.c
@@ -424,17 +424,21 @@ int launcher_read_desktop_file(const char *path, DesktopEntry *entry)
 		return 0;
 	}
 
+	int inside_desktop_entry = 0;
 	while (getline(&line, &line_size, fp) >= 0) {
 		int len = strlen(line);
 		if (len == 0)
 			continue;
 		line[len - 1] = '\0';
-		if (parse_dektop_line(line, &key, &value)) {
-			if (strcmp(key, "Name") == 0) {
+		if (line[0] == '[') {
+			inside_desktop_entry = (strcmp(line, "[Desktop Entry]") == 0);
+		}
+		if (inside_desktop_entry && parse_dektop_line(line, &key, &value)) {
+			if (!entry->name && strcmp(key, "Name") == 0) {
 				entry->name = strdup(value);
-			} else if (strcmp(key, "Exec") == 0) {
+			} else if (!entry->exec && strcmp(key, "Exec") == 0) {
 				entry->exec = strdup(value);
-			} else if (strcmp(key, "Icon") == 0) {
+			} else if (!entry->icon && strcmp(key, "Icon") == 0) {
 				entry->icon = strdup(value);
 			}
 		}
@@ -702,9 +706,9 @@ void launcher_load_themes(Launcher *launcher)
 	if (!icon_theme_name) {
 		fprintf(stderr, "Missing launcher theme, default to 'hicolor'.\n");
 		icon_theme_name = strdup("hicolor");
-	}
-	else
+	} else {
 		fprintf(stderr, "Loading %s. Icon theme :", icon_theme_name);
+	}
 
 	GSList *queue = g_slist_append(NULL, strdup(icon_theme_name));
 	GSList *queued = g_slist_append(NULL, strdup(icon_theme_name));