From c9d7b956bb1b4aae61dee98930a3ab6e37a0e92d Mon Sep 17 00:00:00 2001
From: iaom <zhangpengfei@kylinos.cn>
Date: Wed, 3 Jan 2024 18:22:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(websearch):=E8=A7=A3=E5=86=B3=E5=81=B6?=
 =?UTF-8?q?=E7=8E=B0=E6=89=BE=E4=B8=8D=E5=88=B0=E6=B5=8F=E8=A7=88=E5=99=A8?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libsearch/websearch/web-search-plugin.cpp | 33 +++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/libsearch/websearch/web-search-plugin.cpp b/libsearch/websearch/web-search-plugin.cpp
index c307df5..47916a0 100644
--- a/libsearch/websearch/web-search-plugin.cpp
+++ b/libsearch/websearch/web-search-plugin.cpp
@@ -54,19 +54,30 @@ void UkuiSearch::WebSearchPlugin::KeywordSearch(QString keyword, DataQueue<UkuiS
     resultInfo.name = m_keyWord;
     resultInfo.type = 0;
 
-    QByteArray ba = QString(DESKTOPPATH + getDefaultAppId(BROWSERTYPE)).toUtf8();
-    GDesktopAppInfo * textinfo = g_desktop_app_info_new_from_filename(ba.constData());
-    char *iconname = g_icon_to_string(g_app_info_get_icon(G_APP_INFO(textinfo)));
-    QIcon appicon;
-    appicon = IconLoader::loadIconQt(QString(QLatin1String(iconname)),
-                               QIcon(QString("/usr/share/pixmaps/"+QString(QLatin1String(iconname))
-                                             +".png")));
-    g_free(iconname);
-    resultInfo.icon = QIcon(appicon);
-
+    QIcon appIcon;
+    GAppInfo * app = g_app_info_get_default_for_type(BROWSERTYPE, false);
+    if(app) {
+        GIcon *gIcon = g_app_info_get_icon(app);
+        if(G_IS_ICON(gIcon)) {
+            const gchar* const* iconNames = g_themed_icon_get_names(G_THEMED_ICON(gIcon));
+            if(iconNames) {
+                auto p = iconNames;
+                while(*p) {
+                    appIcon = IconLoader::loadIconXdg(*p);
+                    if(appIcon.isNull()) {
+                        p++;
+                    } else {
+                        break;
+                    }
+                }
+            }
+        }
+        g_object_unref(gIcon);
+        g_object_unref(app);
+    }
+    resultInfo.icon = appIcon.isNull()? IconLoader::loadIconQt("unknown", QIcon(":/res/icons/unknown.svg")) : appIcon;
     resultInfo.actionKey = m_keyWord;
     searchResult->enqueue(resultInfo);
-    g_object_unref(textinfo);
 }
 
 void WebSearchPlugin::stopSearch()