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

fixed theme detection in local .icons directory

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@580 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-10-23 16:33:12 +00:00
parent eb07f935fe
commit faa04ee402
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/launcher/launcher.c
View File

@@ -473,29 +473,33 @@ IconTheme *load_theme(char *name)
if (name == NULL) if (name == NULL)
return NULL; return NULL;
fprintf(stderr, "Loading icon theme %s\n", name); file_name = g_build_filename(g_get_home_dir(), ".icons", name, "index.theme", NULL);
file_name = malloc(100 + strlen(name));
sprintf(file_name, "~/.icons/%s/index.theme", name);
if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) { if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) {
sprintf(file_name, "/usr/share/icons/%s/index.theme", name); g_free (file_name);
file_name = g_build_filename("/usr", "share", "icons", name, "index.theme", NULL);
if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) { if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) {
sprintf(file_name, "/usr/share/pixmaps/%s/index.theme", name); g_free (file_name);
file_name = g_build_filename("/usr", "share", "pixmaps", name, "index.theme", NULL);
if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) { if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) {
free(file_name); g_free (file_name);
file_name = NULL; file_name = NULL;
} }
} }
} }
if (!file_name) { if (!file_name) {
fprintf(stderr, "Could not load theme %s\n", name); fprintf(stderr, "Could not found theme '%s'\n", name);
return NULL; return NULL;
} }
if ((f = fopen(file_name, "rt")) == NULL) if ((f = fopen(file_name, "rt")) == NULL) {
fprintf(stderr, "Could not open theme '%s'\n", file_name);
return NULL; return NULL;
}
else
fprintf(stderr, "Loading icon theme '%s'\n", file_name);
free(file_name); g_free (file_name);
theme = calloc(1, sizeof(IconTheme)); theme = calloc(1, sizeof(IconTheme));
theme->name = strdup(name); theme->name = strdup(name);
@@ -793,6 +797,7 @@ char *icon_path(Launcher *launcher, const char *icon_name, int size)
for (theme = launcher->icon_themes; theme; theme = g_slist_next(theme)) { for (theme = launcher->icon_themes; theme; theme = g_slist_next(theme)) {
GSList *dir; GSList *dir;
for (dir = ((IconTheme*)theme->data)->list_directories; dir; dir = g_slist_next(dir)) { for (dir = ((IconTheme*)theme->data)->list_directories; dir; dir = g_slist_next(dir)) {
//printf("directory %s, size %d\n", ((IconThemeDir*)dir->data)->name, ((IconThemeDir*)dir->data)->size);
if (directory_matches_size((IconThemeDir*)dir->data, size)) { if (directory_matches_size((IconThemeDir*)dir->data, size)) {
GSList *base; GSList *base;
for (base = basenames; base; base = g_slist_next(base)) { for (base = basenames; base; base = g_slist_next(base)) {