From c3089d70c0841d5a820ac6425043bb3ea771cdc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kondor=20D=C3=A1niel?= Date: Sat, 21 Sep 2024 15:48:36 +0200 Subject: [PATCH 1/2] dock: look for GNOME apps when matching icons fixes finding icon for gedit on Ubuntu 24.04 --- src/dock/toplevel-icon.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dock/toplevel-icon.cpp b/src/dock/toplevel-icon.cpp index d0dbfe5e..7b95cf24 100644 --- a/src/dock/toplevel-icon.cpp +++ b/src/dock/toplevel-icon.cpp @@ -239,8 +239,10 @@ Icon get_from_desktop_app_info(std::string app_id) "/usr/share/applications/", "/usr/share/applications/kde/", "/usr/share/applications/org.kde.", + "/usr/share/applications/org.gnome.", "/usr/local/share/applications/", "/usr/local/share/applications/org.kde.", + "/usr/local/share/applications/org.gnome.", }; std::vector app_id_variations = { From d8ca94ed65376b4c44e2fbdb5b22baebcc25722c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kondor=20D=C3=A1niel?= Date: Sat, 21 Sep 2024 16:16:34 +0200 Subject: [PATCH 2/2] dock: more cases when matching apps handle when the .desktop file start with a capital letter; fixes evince (org.gnome.Evince) and devhelp (org.gnome.Devhelp) on Ubuntu 24.04 --- src/dock/toplevel-icon.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/dock/toplevel-icon.cpp b/src/dock/toplevel-icon.cpp index 7b95cf24..e29fb124 100644 --- a/src/dock/toplevel-icon.cpp +++ b/src/dock/toplevel-icon.cpp @@ -248,7 +248,10 @@ Icon get_from_desktop_app_info(std::string app_id) std::vector app_id_variations = { app_id, tolower(app_id), + tolower(app_id), }; + // e.g. org.gnome.Evince.desktop + app_id_variations[2][0] = std::toupper(app_id_variations[2][0]); std::vector suffixes = { "",