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

Expand ~ in launcher_item_app

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@726 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
o9000
2015-03-01 10:33:05 +00:00
committed by mrovi9000@gmail.com
parent 0d1b78d808
commit ba40b0752f
5 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tint2conf/properties.c
View File

@@ -1851,6 +1851,10 @@ void create_launcher(GtkWidget *parent)
fprintf(stderr, "Loading .desktop files\n"); fflush(stderr);
load_desktop_files("/usr/share/applications");
gchar *path = g_build_filename(g_get_home_dir(), ".local/share/applications", NULL);
load_desktop_files(path);
g_free(path);
load_icons(launcher_apps);
load_icons(all_apps);
fprintf(stderr, "Desktop files loaded\n"); fflush(stderr);

10
src/tint2conf/properties_rw.c
View File

@@ -409,7 +409,9 @@ void config_write_launcher(FILE *fp)
gtk_tree_model_get(GTK_TREE_MODEL(launcher_apps), &iter,
appsColPath, &app_path,
-1);
fprintf(fp, "launcher_item_app = %s\n", app_path);
char *contracted = contract_tilde(app_path);
fprintf(fp, "launcher_item_app = %s\n", contracted);
free(contracted);
g_free(app_path);
}
@@ -1079,8 +1081,10 @@ void add_entry(char *key, char *value)
gtk_spin_button_set_value(GTK_SPIN_BUTTON(launcher_icon_size), atoi(value));
}
else if (strcmp(key, "launcher_item_app") == 0) {
load_desktop_file(value, TRUE);
load_desktop_file(value, FALSE);
char *path = expand_tilde(value);
load_desktop_file(path, TRUE);
load_desktop_file(path, FALSE);
free(path);
}
else if (strcmp(key, "launcher_icon_theme") == 0) {
set_current_icon_theme(value);