icon-loader: fall back to app-id if icon from .desktop failed

Reported-By: LimeOn via IRC

diff --git a/src/icon-loader.c b/src/icon-loader.c
index 43c5f48a9fd65130937ca6350fb5d3ea71563bd8..d31ae07eccd4e21e03399ca430ad9c1dc6dc7567 100644 (file)
--- a/src/icon-loader.c
+++ b/src/icon-loader.c
@@ -290,6 +290,10 @@ icon_loader_lookup(struct server *server, const char *app_id, int size,
        } else {
                /* this should be the case for most icons */
                ret = process_rel_name(&ctx, icon_name, loader, lookup_size, lookup_scale);
+               /* Icon defined in .desktop file could not be loaded, retry with app_id */
+               if (ret < 0) {
+                       ret = process_rel_name(&ctx, app_id, loader, lookup_size, lookup_scale);
+               }
        }
        if (ret < 0) {
                return NULL;