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

Launcher: Read and display both Name and GenericName from desktop files (issue #571)

Browse Source
This commit is contained in:
o9000
2016-03-20 14:37:32 +01:00
parent 5a08d028ce
commit c8250e5200
3 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/launcher/launcher.c
View File

@@ -140,7 +140,7 @@ void cleanup_launcher_theme(Launcher *launcher)
free(launcherIcon->icon_name);
free(launcherIcon->icon_path);
free(launcherIcon->cmd);
free(launcherIcon->icon_tooltip);
g_free(launcherIcon->icon_tooltip);
}
free(launcherIcon);
}
@@ -457,7 +457,19 @@ void launcher_load_icons(Launcher *launcher)
launcherIcon->cmd = strdup(entry.exec);
launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(DEFAULT_ICON);
launcherIcon->icon_size = 1;
launcherIcon->icon_tooltip = entry.name ? strdup(entry.name) : strdup(entry.exec);
if (entry.name) {
if (entry.generic_name) {
launcherIcon->icon_tooltip = g_strdup_printf("%s (%s)", entry.name, entry.generic_name);
} else {
launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.name);
}
} else {
if (entry.generic_name) {
launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.generic_name);
} else if (entry.exec) {
launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.exec);
}
}
launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
add_area(&launcherIcon->area, (Area *)launcher);
}