From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Tue, 7 Feb 2023 02:41:11 +0000 (+0200)
Subject: Fix last hardcoded direct usages of AppIcon.png
X-Git-Tag: 1.4.0~4
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/55d12fb776c696396739f180a7a93a8aeb9069b0

Fix last hardcoded direct usages of AppIcon.png

Since 574405d it's additionally installed under a 512x512 XDG icon dir
just looking it up by "waydroid" should work.
---

diff --git a/data/waydroid.app.install.desktop b/data/waydroid.app.install.desktop
index 73d26d1..a0147ab 100644
--- a/data/waydroid.app.install.desktop
+++ b/data/waydroid.app.install.desktop
@@ -4,4 +4,4 @@ Name=Install in Waydroid
 NoDisplay=true
 MimeType=application/vnd.android.package-archive
 Exec=/usr/bin/waydroid app install %f
-Icon=/usr/lib/waydroid/data/AppIcon.png
+Icon=waydroid
diff --git a/data/waydroid.market.desktop b/data/waydroid.market.desktop
index 1d61aa6..70e5bc5 100644
--- a/data/waydroid.market.desktop
+++ b/data/waydroid.market.desktop
@@ -2,7 +2,7 @@
 Name=Waydroid Market
 Comment=Android Market Protocol Handler
 Exec=waydroid app intent android.intent.action.VIEW %u
-Icon=/usr/lib/waydroid/data/AppIcon.png
+Icon=waydroid
 Type=Application
 Encoding=UTF-8
 Terminal=false
diff --git a/tools/actions/initializer.py b/tools/actions/initializer.py
index ed885f5..41a0be3 100644
--- a/tools/actions/initializer.py
+++ b/tools/actions/initializer.py
@@ -293,7 +293,7 @@ def remote_init_client(args):
             channels_cfg = tools.config.load_channels()
 
             self.set_default_size(600, 250)
-            self.set_icon_from_file(tools.config.tools_src + "/data/AppIcon.png")
+            self.set_icon_name("waydroid")
 
             grid = Gtk.Grid(row_spacing=6, column_spacing=6, margin=10, column_homogeneous=True)
             grid.set_hexpand(True)