From 03c014cb38eab456df89b5672159c2ec84f5536f Mon Sep 17 00:00:00 2001
From: Fabiano Fidêncio <fidencio@redhat.com>
Date: Tue, 23 Jun 2015 13:24:55 +0200
Subject: msi: 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.
---
 data/Makefile.am        |  1 -
 data/virt-viewer.wxs.in | 42 ++++++++++++------------------------------
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index 29c565e..29887b9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -69,7 +69,6 @@ virt-viewer-$(WIXL_ARCH)-$(VERSION).msi: virt-viewer.wxs deps.txt
 	    --directory-ref=INSTALLDIR > virt-viewer-files.wxs &&	\
 	MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix)	\
              -D DESTDIR=$$DESTDIR$(prefix)				\
-             -D GtkVersion=$(GTK_API_VERSION)				\
              -D HaveSpiceGtk=$(HaveSpiceGtk)				\
              -D HaveGtkVnc=$(HaveGtkVnc)				\
              -D HaveLibvirt=$(HaveLibvirt)				\
diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in
index 1c02256..48ef4ca 100644
--- a/data/virt-viewer.wxs.in
+++ b/data/virt-viewer.wxs.in
@@ -16,22 +16,13 @@
       <?define Win64 = "no"?>
   <?endif?>
 
-  <?if $(var.GtkVersion) = "2.0"?>
-    <?if $(var.HaveSpiceGtk) = "True"?>
-      <?require spice-gtk.wxi?>
-    <?endif?>
-    <?if $(var.HaveGtkVnc) = "True"?>
-      <?require gtk-vnc.wxi?>
-    <?endif?>
-  <?else?>
-    <?if $(var.HaveSpiceGtk) = "True"?>
-      <?require spice-gtk3.wxi?>
-    <?endif?>
-    <?if $(var.HaveGtkVnc) = "True"?>
-      <?require gtk-vnc2.wxi?>
-    <?endif?>
-      <?require adwaita-icons-needed.wxi?>
+  <?if $(var.HaveSpiceGtk) = "True"?>
+    <?require spice-gtk3.wxi?>
+  <?endif?>
+  <?if $(var.HaveGtkVnc) = "True"?>
+    <?require gtk-vnc2.wxi?>
   <?endif?>
+  <?require adwaita-icons-needed.wxi?>
   <?if $(var.HaveLibvirt) = "True"?>
     <?require libvirt.wxi?>
   <?endif?>
@@ -131,22 +122,13 @@
     </DirectoryRef>
 
     <Feature Id="Complete"  Level="1">
-      <?if $(var.GtkVersion) = "2.0"?>
-        <?if $(var.HaveSpiceGtk) = "True"?>
-          <ComponentGroupRef Id="CG.spice-gtk"/>
-        <?endif?>
-        <?if $(var.HaveGtkVnc) = "True"?>
-          <ComponentGroupRef Id="CG.gtk-vnc"/>
-        <?endif?>
-      <?else?>
-        <?if $(var.HaveSpiceGtk) = "True"?>
-          <ComponentGroupRef Id="CG.spice-gtk3"/>
-        <?endif?>
-        <?if $(var.HaveGtkVnc) = "True"?>
-          <ComponentGroupRef Id="CG.gtk-vnc2"/>
-        <?endif?>
-        <ComponentGroupRef Id="CG.adwaita-icons-needed"/>
+      <?if $(var.HaveSpiceGtk) = "True"?>
+        <ComponentGroupRef Id="CG.spice-gtk3"/>
+      <?endif?>
+      <?if $(var.HaveGtkVnc) = "True"?>
+        <ComponentGroupRef Id="CG.gtk-vnc2"/>
       <?endif?>
+      <ComponentGroupRef Id="CG.adwaita-icons-needed"/>
       <?if $(var.HaveLibvirt) = "True"?>
         <ComponentGroupRef Id="CG.libvirt"/>
       <?endif?>
-- 
cgit