nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #186 from progandy/master

Browse Source 
allow file:// protocol for icons
This commit is contained in:
Sascha Kruse 2014-07-29 21:50:21 +02:00
commit 088cfe1021
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x.c
View File

@ -276,7 +276,14 @@ static dimension_t calculate_dimensions(GSList *layouts)
static cairo_surface_t *get_icon_surface(char *icon_path) static cairo_surface_t *get_icon_surface(char *icon_path)
{ {
cairo_surface_t *icon_surface = NULL; cairo_surface_t *icon_surface = NULL;
gchar *uri_path = NULL;
if (strlen(icon_path) > 0 && settings.icon_position != icons_off) { if (strlen(icon_path) > 0 && settings.icon_position != icons_off) {
if (g_str_has_prefix(icon_path, "file://")) {
uri_path = g_filename_from_uri(icon_path, NULL, NULL);
if (uri_path != NULL) {
icon_path = uri_path;
}
}
/* absolute path? */ /* absolute path? */
if (icon_path[0] == '/' || icon_path[0] == '~') { if (icon_path[0] == '/' || icon_path[0] == '~') {
icon_surface = cairo_image_surface_create_from_png(icon_path); icon_surface = cairo_image_surface_create_from_png(icon_path);
@ -309,9 +316,13 @@ static cairo_surface_t *get_icon_surface(char *icon_path)
start = end + 1; start = end + 1;
} while (*(end) != '\0'); } while (*(end) != '\0');
} }
if (icon_surface == NULL) if (icon_surface == NULL) {
fprintf(stderr, fprintf(stderr,
"Could not load icon: '%s'\n", icon_path); "Could not load icon: '%s'\n", icon_path);
}
if (uri_path != NULL) {
g_free(uri_path);
}
} }
return icon_surface; return icon_surface;
} }