fix: Use proper app icon naming (#2814)

bottles/meson.build

@@ -7,7 +7,6 @@ conf = configuration_data()
 conf.set('PYTHON', python.find_installation('python3').full_path())
 conf.set('APP_ID', APP_ID)
 conf.set('APP_VERSION', APP_VERSION)
-conf.set('APP_ICON', APP_ICON)
 conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir')))
 conf.set('pkgdatadir', pkgdatadir)
 

data/com.usebottles.bottles.desktop.in.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=@APP_NAME@
 Comment=Run Windows Software
-Icon=@APP_ICON@
+Icon=@APP_ID@
 Exec=bottles %u
 Terminal=false
 Type=Application

data/meson.build

@@ -1,6 +1,6 @@
 conf = configuration_data()
+conf.set('APP_ID', APP_ID)
 conf.set('APP_NAME', APP_NAME)
-conf.set('APP_ICON', APP_ICON)
 
 desktop_file = configure_file(
         input:  'com.usebottles.bottles.desktop.in.in',
@@ -50,7 +50,7 @@ if compile_schemas.found()
 endif
 
 install_data(
-    join_paths('icons/hicolor/scalable/apps', APP_ICON),
+    join_paths('icons/hicolor/scalable/apps', APP_ID + '.' + 'svg'),
     install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons/hicolor/scalable/apps')
 )
 

meson.build

@@ -22,9 +22,6 @@ if devel == true
 	APP_ID += '.' + 'Devel'
 endif
 
-APP_ICON = APP_ID + '.' + 'svg'
-
-
 
 gnome = import('gnome')
 i18n = import('i18n')