mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-14 08:22:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/bugfix/iconsnotfound' into 0.15

Browse source
This commit is contained in:
David McKinney 2018-03-24 19:05:12 -04:00
commit 4d5fae4567
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
swaybar/tray/icon.c
View file

@ -28,7 +28,7 @@
/* Finds all themes that the given theme inherits */
static list_t *find_inherits(const char *theme_dir) {
const char inherits[] = "Inherits";
const char index_name[] = "index.theme";
const char index_name[] = "/index.theme";
list_t *themes = create_list();
FILE *index = NULL;
char *path = malloc(strlen(theme_dir) + sizeof(index_name));
@ -286,6 +286,10 @@ static list_t* find_theme_subdirs(const char *theme_dir) {
}
if (strncmp(directories, buf, sizeof(directories) - 1) == 0) {
char *dirstr = buf + sizeof(directories);
int len = strlen(dirstr);
if (dirstr[len-1] == '\n') {
dirstr[len-1] = '\0';
}
dirs = split_subdirs(dirstr);
break;
}