Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix desktop entry parsing (issue #570)

Browse Source
This commit is contained in:
o9000
2016-03-07 22:26:42 +01:00
parent 85a97a9cab
commit 3811929a6e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/launcher/apps-common.c
View File

@@ -136,14 +136,15 @@ gboolean read_desktop_file_full_path(const char *path, DesktopEntry *entry)
// we currently do not know about any Name key at all, so use an invalid index // we currently do not know about any Name key at all, so use an invalid index
int lang_index = lang_index_default + 1; int lang_index = lang_index_default + 1;
int inside_desktop_entry = 0; gboolean inside_desktop_entry = 0;
char *line = NULL; char *line = NULL;
size_t line_size; size_t line_size;
while (getline(&line, &line_size, fp) >= 0) { while (getline(&line, &line_size, fp) >= 0) {
int len = strlen(line); int len = strlen(line);
if (len == 0) if (len == 0)
continue; continue;
line[len - 1] = '\0'; if (line[len - 1] == '\n')
line[len - 1] = '\0';
if (line[0] == '[') { if (line[0] == '[') {
inside_desktop_entry = (strcmp(line, "[Desktop Entry]") == 0); inside_desktop_entry = (strcmp(line, "[Desktop Entry]") == 0);
} }
@@ -169,7 +170,7 @@ gboolean read_desktop_file_full_path(const char *path, DesktopEntry *entry)
entry->exec = strdup(value); entry->exec = strdup(value);
} else if (!entry->icon && strcmp(key, "Icon") == 0) { } else if (!entry->icon && strcmp(key, "Icon") == 0) {
entry->icon = strdup(value); entry->icon = strdup(value);
} else if (!entry->icon && strcmp(key, "NoDisplay") == 0) { } else if (strcmp(key, "NoDisplay") == 0) {
entry->hidden_from_menus = strcasecmp(value, "true") == 0; entry->hidden_from_menus = strcasecmp(value, "true") == 0;
} }
} }