From e8d80711f8361e9330d7fa720d5a716339040e51 Mon Sep 17 00:00:00 2001 From: Simon Long Date: Fri, 8 Nov 2024 21:42:02 +0000 Subject: [PATCH] icon: matching partial strings (#2266) ...to handle for example app-id="gimp-2.10" with file "gimp.desktop" --- src/icon-loader.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/icon-loader.c b/src/icon-loader.c index 4a15a23b..bf4f2fa3 100644 --- a/src/icon-loader.c +++ b/src/icon-loader.c @@ -236,6 +236,20 @@ get_db_entry_by_id_fuzzy(struct sfdo_desktop_db *db, const char *app_id) } } + /* Try matching partial strings - catches GIMP, among others */ + for (size_t i = 0; i < n_entries; i++) { + struct sfdo_desktop_entry *entry = entries[i]; + const char *desktop_id = sfdo_desktop_entry_get_id(entry, NULL); + const char *dot = strrchr(desktop_id, '.'); + const char *desktop_id_base = dot ? (dot + 1) : desktop_id; + int alen = strlen(app_id); + int dlen = strlen(desktop_id_base); + + if (!strncasecmp(app_id, desktop_id, alen > dlen ? dlen : alen)) { + return entry; + } + } + return NULL; }