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 73d26d19e4bd1aad6396a8db92546d8214ddabb9..a0147aba2994116d3a61dce3be39bbb5577a686d 100644 (file)
--- 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 1d61aa6eb33191b0bbeb8a4038f8e15fb688cfa6..70e5bc56e4c848ab0edce48750c53dd7024f5d1a 100644 (file)
--- 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 ed885f5c5361f614ea438006525ac3a0fce36e1c..41a0be38320bb2d01ad52b83f906b0a6fb805ade 100644 (file)
--- 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)