Merge pull request #1409 from bynect/fix-uri

Handle correctly file uri icons

Author: bynect

src/icon.c

@@ -214,16 +214,15 @@ char *get_path_from_icon_name(const char *iconname, int size)
         if (STR_EMPTY(iconname))
                 return NULL;
 
-        char *uri_path = NULL;
         if (g_str_has_prefix(iconname, "file://")) {
                 char *uri_path = g_filename_from_uri(iconname, NULL, NULL);
                 if (STR_EMPTY(uri_path)) {
                         LOG_W("Invalid file uri '%s'", iconname);
                         return NULL;
                 }
-                iconname = uri_path;
+                return uri_path;
         } else if (iconname[0] == '/' || iconname[0] == '~') {
-                // Return absolute path
+                // NOTE: Paths starting with ~ should have already been handled at this point
                 return g_strdup(iconname);
         } else if (settings.enable_recursive_icon_lookup) {
                 char *path = find_icon_path(iconname, size);
@@ -266,7 +265,6 @@ char *get_path_from_icon_name(const char *iconname, int size)
         else
                 LOG_I("Found icon '%s' at %s", iconname, path);
 
-        g_free(uri_path);
         return path;
 }