nsis: drop gtk2 support

As virt-viewer builds for Windows are using GTK3 nowadays, we can easily
drop GTK2 support and avoid maintenance effort in something that is not
used/tested anymore.

2 files changed, 212 insertions, 284 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 510169b..29c565e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -48,7 +48,6 @@ virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt
 	make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
 	makensis -NOCD							\
              -DDESTDIR=$$DESTDIR					\
-             -DGTK_VERSION=$(GTK_API_VERSION)				\
              -DHaveSpiceGtk=$(HaveSpiceGtk)				\
              -DHaveGtkVnc=$(HaveGtkVnc)					\
              -DHaveLibvirt=$(HaveLibvirt)				\
diff --git a/data/virt-viewer.nsis.in b/data/virt-viewer.nsis.in
index ca96fbf..deecd95 100755
--- a/data/virt-viewer.nsis.in
+++ b/data/virt-viewer.nsis.in
@@ -91,40 +91,26 @@ Section "VirtViewer"
 
     File "@prefix@/bin/libspice-client-glib-2.0-8.dll"
     File "@prefix@/bin/libspice-controller-0.dll"
-    !if ${GTK_VERSION} == 2.0
-      File "@prefix@/bin/libspice-client-gtk-2.0-4.dll"
-    !else
-      File "@prefix@/bin/libspice-client-gtk-3.0-4.dll"
-    !endif
+    File "@prefix@/bin/libspice-client-gtk-3.0-4.dll"
   !endif
 
   File "@prefix@/bin/libatk-1.0-0.dll"
   File "@prefix@/bin/libcairo-2.dll"
-  !if ${GTK_VERSION} == 3.0
-    File "@prefix@/bin/libcairo-gobject-2.dll"
-    File "@prefix@/bin/libepoxy-0.dll"
-  !endif
+  File "@prefix@/bin/libcairo-gobject-2.dll"
+  File "@prefix@/bin/libepoxy-0.dll"
   File "@prefix@/bin/libcrypto-10.dll"
   File "@prefix@/bin/libexpat-1.dll"
   File "@prefix@/bin/libffi-6.dll"
   File "@prefix@/bin/libfontconfig-1.dll"
   File "@prefix@/bin/libfreetype-6.dll"
-  !if ${GTK_VERSION} == 2.0
-    File "@prefix@/bin/libgdk-win32-2.0-0.dll"
-  !else
-    File "@prefix@/bin/libgdk-3-0.dll"
-  !endif
+  File "@prefix@/bin/libgdk-3-0.dll"
   File "@prefix@/bin/libgdk_pixbuf-2.0-0.dll"
   File "@prefix@/bin/libgio-2.0-0.dll"
   File "@prefix@/bin/libglib-2.0-0.dll"
   File "@prefix@/bin/libgmodule-2.0-0.dll"
   File "@prefix@/bin/libgobject-2.0-0.dll"
   File "@prefix@/bin/libgthread-2.0-0.dll"
-  !if ${GTK_VERSION} == 2.0
-    File "@prefix@/bin/libgtk-win32-2.0-0.dll"
-  !else
-    File "@prefix@/bin/libgtk-3-0.dll"
-  !endif
+  File "@prefix@/bin/libgtk-3-0.dll"
   File "@prefix@/bin/iconv.dll"
   File "@prefix@/bin/libintl-8.dll"
   File "@prefix@/bin/libjpeg-62.dll"
@@ -158,11 +144,7 @@ Section "VirtViewer"
     File "@prefix@/bin/libgpg-error-0.dll"
     File "@prefix@/bin/libgcrypt-20.dll"
     File "@prefix@/bin/libgvnc-1.0-0.dll"
-    !if ${GTK_VERSION} == 2.0
-      File "@prefix@/bin/libgtk-vnc-1.0-0.dll"
-    !else
-      File "@prefix@/bin/libgtk-vnc-2.0-0.dll"
-    !endif
+    File "@prefix@/bin/libgtk-vnc-2.0-0.dll"
   !endif
 
   File "@prefix@/bin/libgnutls-28.dll"
@@ -193,27 +175,15 @@ Section "VirtViewer"
 
   SetOutPath "$INSTDIR\etc"
   File /r "@prefix@/etc/fonts"
-  !if ${GTK_VERSION} == 2.0
-    File /r "@prefix@/etc/gtk-2.0"
-  !else
-    File /r "@prefix@/etc/gtk-3.0"
-  !endif
+  File /r "@prefix@/etc/gtk-3.0"
   File /r "@prefix@/etc/libvirt"
   CreateDirectory "$INSTDIR\etc\pango"
 
-  !if ${GTK_VERSION} == 2.0
-    CreateDirectory "$INSTDIR\etc\gtk-2.0"
-  !else
-    CreateDirectory "$INSTDIR\etc\gtk-3.0"
-  !endif
+  CreateDirectory "$INSTDIR\etc\gtk-3.0"
 
   SetOutPath "$INSTDIR\lib"
   File /r "@prefix@/lib/gdk-pixbuf-2.0"
-  !if ${GTK_VERSION} == 2.0
-    File /r "@prefix@/lib/gtk-2.0"
-  !else
-    File /r "@prefix@/lib/gtk-3.0"
-  !endif
+  File /r "@prefix@/lib/gtk-3.0"
   File /r "@prefix@/lib/pango"
 
   !if ${HaveSpiceGtk} == True
@@ -241,9 +211,7 @@ Section "VirtViewer"
   !if ${HaveLibvirt} == True
     File /r "@prefix@/share/libvirt"
   !endif
-  !if ${GTK_VERSION} == 3.0
-    File /r "@prefix@/share/glib-2.0"
-  !endif
+  File /r "@prefix@/share/glib-2.0"
 
   # fixme for all languages
   SetOutPath "$INSTDIR\share\locale\fr"
@@ -256,17 +224,6 @@ Section "VirtViewer"
   SetOutPath "$INSTDIR\share\virt-viewer\ui"
   File "${DESTDIR}@prefix@/share/virt-viewer/ui/*.xml"
 
-  !if ${GTK_VERSION} == 2.0
-    SetOutPath "$INSTDIR\share\themes\MS-Windows\gtk-2.0"
-    File "@prefix@/share/themes/MS-Windows/gtk-2.0/gtkrc"
-
-    SetOutPath "$INSTDIR\etc\gtk-2.0"
-    FileOpen $0 gtkrc w
-    FileWrite $0 "gtk-theme-name = $\"MS-Windows$\" $\n"
-    FileWrite $0 "gtk-icon-theme-name = $\"hicolor$\" $\n"
-    FileClose $0
-  !endif
-
   SetOutPath "$INSTDIR\share\icons\hicolor"
   File "/usr/share/icons/hicolor/index.theme"
 
@@ -282,202 +239,200 @@ Section "VirtViewer"
   SetOutPath "$INSTDIR\share\icons\hicolor\48x48\apps"
   File "${DESTDIR}@prefix@/share/icons/hicolor/48x48/apps/virt-viewer.png"
 
-  !if ${GTK_VERSION} == 3.0
-    CreateDirectory "$INSTDIR\share\icons\Adwaita"
-    SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\places"
-    File "/usr/share/icons/Adwaita/16x16/places/folder-documents-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/folder-download-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/folder-music-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/folder-pictures-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/folder-publicshare-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/folder-remote-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/folder-saved-search-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/folder-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/folder-templates-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/folder-videos-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/network-server-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/network-workgroup-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/start-here-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/user-bookmarks-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/user-desktop-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/user-home-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/places/user-trash-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\24x24\places"
-    File "/usr/share/icons/Adwaita/24x24/places/folder-documents-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/folder-download-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/folder-music-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/folder-pictures-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/folder-publicshare-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/folder-remote-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/folder-saved-search-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/folder-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/folder-templates-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/folder-videos-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/network-server-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/network-workgroup-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/start-here-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/user-bookmarks-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/user-desktop-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/user-home-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/places/user-trash-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\places"
-    File "/usr/share/icons/Adwaita/32x32/places/folder-documents-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/folder-download-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/folder-music-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/folder-pictures-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/folder-publicshare-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/folder-remote-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/folder-saved-search-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/folder-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/folder-templates-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/folder-videos-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/network-server-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/network-workgroup-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/start-here-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/user-bookmarks-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/user-desktop-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/user-home-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/places/user-trash-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\places"
-    File "/usr/share/icons/Adwaita/48x48/places/folder-documents-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/folder-download-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/folder-music-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/folder-pictures-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/folder-publicshare-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/folder-remote-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/folder-saved-search-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/folder-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/folder-templates-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/folder-videos-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/network-server-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/network-workgroup-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/start-here-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/user-bookmarks-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/user-desktop-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/user-home-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/places/user-trash-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\64x64\places"
-    File "/usr/share/icons/Adwaita/64x64/places/folder-documents-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/folder-download-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/folder-music-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/folder-pictures-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/folder-publicshare-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/folder-remote-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/folder-saved-search-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/folder-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/folder-templates-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/folder-videos-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/network-server-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/network-workgroup-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/start-here-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/user-bookmarks-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/user-desktop-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/user-home-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/places/user-trash-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\96x96\places"
-    File "/usr/share/icons/Adwaita/96x96/places/folder-documents-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/folder-download-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/folder-music-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/folder-pictures-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/folder-publicshare-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/folder-remote-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/folder-saved-search-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/folder-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/folder-templates-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/folder-videos-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/network-server-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/network-workgroup-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/start-here-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/user-bookmarks-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/user-desktop-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/user-home-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/places/user-trash-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\devices"
-    File "/usr/share/icons/Adwaita/16x16/devices/drive-harddisk-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/devices/drive-optical-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/devices/drive-removable-media-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\24x24\devices"
-    File "/usr/share/icons/Adwaita/24x24/devices/drive-harddisk-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/devices/drive-optical-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/devices/drive-removable-media-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\devices"
-    File "/usr/share/icons/Adwaita/32x32/devices/drive-harddisk-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/devices/drive-optical-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/devices/drive-removable-media-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\devices"
-    File "/usr/share/icons/Adwaita/48x48/devices/drive-harddisk-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/devices/drive-optical-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/devices/drive-removable-media-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\64x64\devices"
-    File "/usr/share/icons/Adwaita/64x64/devices/drive-harddisk-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/devices/drive-optical-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/devices/drive-removable-media-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\96x96\devices"
-    File "/usr/share/icons/Adwaita/96x96/devices/drive-harddisk-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/devices/drive-optical-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/devices/drive-removable-media-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\status"
-    File "/usr/share/icons/Adwaita/16x16/status/checkbox-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/status/checkbox-checked-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\24x24\status"
-    File "/usr/share/icons/Adwaita/24x24/status/checkbox-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/status/checkbox-checked-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\status"
-    File "/usr/share/icons/Adwaita/32x32/status/checkbox-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/status/checkbox-checked-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\status"
-    File "/usr/share/icons/Adwaita/48x48/status/checkbox-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/status/checkbox-checked-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\64x64\status"
-    File "/usr/share/icons/Adwaita/64x64/status/checkbox-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/64x64/status/checkbox-checked-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\96x96\status"
-    File "/usr/share/icons/Adwaita/96x96/status/checkbox-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/96x96/status/checkbox-checked-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\actions"
-    File "/usr/share/icons/Adwaita/16x16/actions/edit-clear-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/16x16/actions/view-restore.png"
-    File "/usr/share/icons/Adwaita/16x16/actions/window-close.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\24x24\actions"
-    File "/usr/share/icons/Adwaita/24x24/actions/edit-clear-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/24x24/actions/view-restore.png"
-    File "/usr/share/icons/Adwaita/24x24/actions/window-close.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\actions"
-    File "/usr/share/icons/Adwaita/32x32/actions/edit-clear-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/32x32/actions/view-restore.png"
-    File "/usr/share/icons/Adwaita/32x32/actions/window-close.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\actions"
-    File "/usr/share/icons/Adwaita/48x48/actions/edit-clear-symbolic.symbolic.png"
-    File "/usr/share/icons/Adwaita/48x48/actions/view-restore.png"
-    File "/usr/share/icons/Adwaita/48x48/actions/window-close.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\64x64\actions"
-    File "/usr/share/icons/Adwaita/64x64/actions/edit-clear-symbolic.symbolic.png"
-
-    SetOutPath "$INSTDIR\share\icons\Adwaita\96x96\actions"
-    File "/usr/share/icons/Adwaita/96x96/actions/edit-clear-symbolic.symbolic.png"
-  !endif
+  CreateDirectory "$INSTDIR\share\icons\Adwaita"
+  SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\places"
+  File "/usr/share/icons/Adwaita/16x16/places/folder-documents-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/folder-download-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/folder-music-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/folder-pictures-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/folder-publicshare-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/folder-remote-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/folder-saved-search-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/folder-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/folder-templates-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/folder-videos-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/network-server-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/network-workgroup-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/start-here-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/user-bookmarks-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/user-desktop-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/user-home-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/places/user-trash-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\24x24\places"
+  File "/usr/share/icons/Adwaita/24x24/places/folder-documents-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/folder-download-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/folder-music-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/folder-pictures-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/folder-publicshare-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/folder-remote-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/folder-saved-search-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/folder-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/folder-templates-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/folder-videos-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/network-server-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/network-workgroup-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/start-here-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/user-bookmarks-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/user-desktop-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/user-home-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/places/user-trash-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\places"
+  File "/usr/share/icons/Adwaita/32x32/places/folder-documents-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/folder-download-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/folder-music-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/folder-pictures-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/folder-publicshare-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/folder-remote-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/folder-saved-search-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/folder-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/folder-templates-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/folder-videos-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/network-server-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/network-workgroup-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/start-here-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/user-bookmarks-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/user-desktop-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/user-home-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/places/user-trash-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\places"
+  File "/usr/share/icons/Adwaita/48x48/places/folder-documents-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/folder-download-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/folder-music-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/folder-pictures-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/folder-publicshare-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/folder-remote-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/folder-saved-search-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/folder-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/folder-templates-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/folder-videos-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/network-server-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/network-workgroup-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/start-here-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/user-bookmarks-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/user-desktop-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/user-home-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/places/user-trash-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\64x64\places"
+  File "/usr/share/icons/Adwaita/64x64/places/folder-documents-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/folder-download-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/folder-music-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/folder-pictures-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/folder-publicshare-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/folder-remote-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/folder-saved-search-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/folder-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/folder-templates-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/folder-videos-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/network-server-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/network-workgroup-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/start-here-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/user-bookmarks-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/user-desktop-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/user-home-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/places/user-trash-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\96x96\places"
+  File "/usr/share/icons/Adwaita/96x96/places/folder-documents-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/folder-download-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/folder-music-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/folder-pictures-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/folder-publicshare-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/folder-remote-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/folder-saved-search-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/folder-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/folder-templates-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/folder-videos-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/network-server-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/network-workgroup-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/start-here-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/user-bookmarks-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/user-desktop-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/user-home-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/places/user-trash-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\devices"
+  File "/usr/share/icons/Adwaita/16x16/devices/drive-harddisk-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/devices/drive-optical-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/devices/drive-removable-media-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\24x24\devices"
+  File "/usr/share/icons/Adwaita/24x24/devices/drive-harddisk-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/devices/drive-optical-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/devices/drive-removable-media-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\devices"
+  File "/usr/share/icons/Adwaita/32x32/devices/drive-harddisk-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/devices/drive-optical-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/devices/drive-removable-media-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\devices"
+  File "/usr/share/icons/Adwaita/48x48/devices/drive-harddisk-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/devices/drive-optical-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/devices/drive-removable-media-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\64x64\devices"
+  File "/usr/share/icons/Adwaita/64x64/devices/drive-harddisk-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/devices/drive-optical-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/devices/drive-removable-media-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\96x96\devices"
+  File "/usr/share/icons/Adwaita/96x96/devices/drive-harddisk-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/devices/drive-optical-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/devices/drive-removable-media-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\status"
+  File "/usr/share/icons/Adwaita/16x16/status/checkbox-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/status/checkbox-checked-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\24x24\status"
+  File "/usr/share/icons/Adwaita/24x24/status/checkbox-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/status/checkbox-checked-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\status"
+  File "/usr/share/icons/Adwaita/32x32/status/checkbox-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/status/checkbox-checked-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\status"
+  File "/usr/share/icons/Adwaita/48x48/status/checkbox-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/status/checkbox-checked-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\64x64\status"
+  File "/usr/share/icons/Adwaita/64x64/status/checkbox-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/64x64/status/checkbox-checked-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\96x96\status"
+  File "/usr/share/icons/Adwaita/96x96/status/checkbox-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/96x96/status/checkbox-checked-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\16x16\actions"
+  File "/usr/share/icons/Adwaita/16x16/actions/edit-clear-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/16x16/actions/view-restore.png"
+  File "/usr/share/icons/Adwaita/16x16/actions/window-close.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\24x24\actions"
+  File "/usr/share/icons/Adwaita/24x24/actions/edit-clear-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/24x24/actions/view-restore.png"
+  File "/usr/share/icons/Adwaita/24x24/actions/window-close.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\32x32\actions"
+  File "/usr/share/icons/Adwaita/32x32/actions/edit-clear-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/32x32/actions/view-restore.png"
+  File "/usr/share/icons/Adwaita/32x32/actions/window-close.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\48x48\actions"
+  File "/usr/share/icons/Adwaita/48x48/actions/edit-clear-symbolic.symbolic.png"
+  File "/usr/share/icons/Adwaita/48x48/actions/view-restore.png"
+  File "/usr/share/icons/Adwaita/48x48/actions/window-close.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\64x64\actions"
+  File "/usr/share/icons/Adwaita/64x64/actions/edit-clear-symbolic.symbolic.png"
+
+  SetOutPath "$INSTDIR\share\icons\Adwaita\96x96\actions"
+  File "/usr/share/icons/Adwaita/96x96/actions/edit-clear-symbolic.symbolic.png"
 
   ReadEnvStr $0 COMSPEC
   SetOutPath "$INSTDIR"
@@ -509,11 +464,7 @@ Section "Uninstall"
   RMDir /r "$INSTDIR\share"
 
   RMDir /r "$INSTDIR\lib\pango"
-  !if ${GTK_VERSION} == 2.0
-    RMDir /r "$INSTDIR\lib\gtk-2.0"
-  !else
-    RMDir /r "$INSTDIR\lib\gtk-3.0"
-  !endif
+  RMDir /r "$INSTDIR\lib\gtk-3.0"
 
   !if ${HaveSpiceGtk} == True
     # gstreamer1
@@ -533,11 +484,7 @@ Section "Uninstall"
   RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0"
 
   RMDir /r "$INSTDIR\etc\pango"
-  !if ${GTK_VERSION} == 2.0
-    RMDir /r "$INSTDIR\etc\gtk-2.0"
-  !else
-    RMDir /r "$INSTDIR\etc\gtk-3.0"
-  !endif
+  RMDir /r "$INSTDIR\etc\gtk-3.0"
   RMDir /r "$INSTDIR\etc\fonts"
   !if {HaveLibvirt} == True
     RMDir /r "$INSTDIR\etc\libvirt"
@@ -548,11 +495,7 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\bin\pango-querymodules.exe"
   Delete /rebootok "$INSTDIR\bin\libpangoft2-1.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll"
-  !if ${GTK_VERSION} == 2.0
-    Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll"
-  !else
-    Delete /rebootok "$INSTDIR\bin\libgdk-3-0.dll"
-  !endif
+  Delete /rebootok "$INSTDIR\bin\libgdk-3-0.dll"
   !if ${HaveSpiceGtk} == True
     # gstreamer1
     Delete /rebootok "$INSTDIR\bin\gst-inspect-1.0.exe"
@@ -579,11 +522,7 @@ Section "Uninstall"
 
     Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-8.dll"
     Delete /rebootok "$INSTDIR\bin\libspice-controller-0.dll"
-    !if ${GTK_VERSION} == 2.0
-      Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-4.dll"
-    !else
-      Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-3.0-4.dll"
-    !endif
+    Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-3.0-4.dll"
   !endif
   Delete /rebootok "$INSTDIR\bin\zlib1.dll"
   Delete /rebootok "$INSTDIR\bin\libreadline6.dll"
@@ -622,19 +561,11 @@ Section "Uninstall"
     Delete /rebootok "$INSTDIR\bin\libgpg-error-0.dll"
     Delete /rebootok "$INSTDIR\bin\libgcrypt-20.dll"
     Delete /rebootok "$INSTDIR\bin\libgvnc-1.0-0.dll"
-    !if ${GTK_VERSION} == 2.0
-      Delete /rebootok "$INSTDIR\bin\libgtk-vnc-1.0-0.dll"
-    !else
-      Delete /rebootok "$INSTDIR\bin\libgtk-vnc-2.0-0.dll"
-    !endif
+    Delete /rebootok "$INSTDIR\bin\libgtk-vnc-2.0-0.dll"
   !endif
   Delete /rebootok "$INSTDIR\bin\libssp-0.dll"
   Delete /rebootok "$INSTDIR\bin\iconv.dll"
-  !if ${GTK_VERSION} == 2.0
-    Delete /rebootok "$INSTDIR\bin\libgtk-win32-2.0-0.dll"
-  !else
-    Delete /rebootok "$INSTDIR\bin\libgtk-3-0.dll"
-  !endif
+  Delete /rebootok "$INSTDIR\bin\libgtk-3-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgthread-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgobject-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgnutls-28.dll"
@@ -646,10 +577,8 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\bin\libexpat-1.dll"
   Delete /rebootok "$INSTDIR\bin\libcrypto-10.dll"
   Delete /rebootok "$INSTDIR\bin\libcairo-2.dll"
-  !if ${GTK_VERSION} == 3.0
-    Delete /rebootok "$INSTDIR\bin\libcairo-gobject-2.dll"
-    Delete /rebootok "$INSTDIR\bin\libepoxy-0.dll"
-  !endif
+  Delete /rebootok "$INSTDIR\bin\libcairo-gobject-2.dll"
+  Delete /rebootok "$INSTDIR\bin\libepoxy-0.dll"
   Delete /rebootok "$INSTDIR\bin\libatk-1.0-0.dll"
   !if ${HaveOVirt} == True
     Delete /rebootok "$INSTDIR\bin\libgovirt-2.dll"