From: John Lindgren <john@jlindgren.net>
Date: Fri, 4 Oct 2024 18:05:31 +0000 (-0400)
Subject: icon-loader: also match desktop entries StartupWMClass
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=b4bc6ffceb4e609dc560053c86de30889ccd363a;p=proto%2Flabwc.git

icon-loader: also match desktop entries StartupWMClass

GIMP for example sets its WM_CLASS to "gimp-2.10", which does not match
the "gimp.desktop" filename, but matches the StartupWMClass key listed
in it.

Thanks to @vyivel for the suggestion.
---

diff --git a/src/icon-loader.c b/src/icon-loader.c
index 20cc9b62..a9444fe4 100644
--- a/src/icon-loader.c
+++ b/src/icon-loader.c
@@ -182,6 +182,13 @@ get_db_entry_by_id_fuzzy(struct sfdo_desktop_db *db, const char *app_id)
 		if (!strcasecmp(app_id, desktop_id_base)) {
 			return entry;
 		}
+
+		/* Try desktop entry's StartupWMClass also */
+		const char *wm_class =
+			sfdo_desktop_entry_get_startup_wm_class(entry, NULL);
+		if (wm_class && !strcasecmp(app_id, wm_class)) {
+			return entry;
+		}
 	}
 
 	return NULL;