[gnome-boxes/drop-ovirt: 5/5] Drop oVirt support

[Felipe Borges <felipeborges src gnome org>]

commit e6e4eeb7adc5c772e43978d937143a3e12c329a4
Author: Felipe Borges <felipeborges gnome org>
Date:   Fri Mar 29 15:41:49 2019 +0100

    Drop oVirt support
    
    The oVirt support has been broken for quite some time and very
    little interest has been shown to keep it alive.

 .gitlab-ci.yml           |   2 +-
 data/ui/wizard-source.ui |   2 +-
 meson_options.txt        |   4 --
 po/POTFILES.in           |   2 -
 po/POTFILES.skip         |   2 -
 src/app.vala             |   5 +-
 src/meson.build          |  14 ------
 src/ovirt-broker.vala    |  69 -------------------------
 src/ovirt-machine.vala   | 128 -----------------------------------------------
 src/spice-display.vala   |  11 +---
 vapi/govirt-1.0.vapi     | 122 --------------------------------------------
 11 files changed, 5 insertions(+), 356 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1ed6ce3..afa93412 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,7 +70,7 @@ fedora:rawhide:
     stage: cross_distro
     before_script:
     - dnf update -y --nogpgcheck
-    - dnf install -y meson git vala gtk3-devel libgovirt-devel
+    - dnf install -y meson git vala gtk3-devel
                      gtk-vnc2-devel libosinfo-devel libsecret-devel
                      libvirt-gconfig-devel libvirt-gobject-devel
                      spice-gtk3-vala libarchive-devel gettext
diff --git a/data/ui/wizard-source.ui b/data/ui/wizard-source.ui
index 64e88b99..2b0bcca7 100644
--- a/data/ui/wizard-source.ui
+++ b/data/ui/wizard-source.ui
@@ -217,7 +217,7 @@
                           <object class="GtkLabel">
                             <property name="visible">True</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Connect to oVirt or Libvirt 
brokers.</property>
+                            <property name="label" translatable="yes">Connect to Libvirt brokers.</property>
                             <property name="xalign">0</property>
                             <property name="wrap">True</property>
                             <property name="max-width-chars">50</property>
diff --git a/meson_options.txt b/meson_options.txt
index c11895fc..c55a4712 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,10 +8,6 @@ option ('distributor_version',
         value: '3',
         description: 'Distributor version used in HTTP user agent')
 
-option ('ovirt',
-        type: 'boolean',
-        value: true)
-
 option ('rdp',
         type: 'boolean',
         value: true)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index eee3e71b..0e5fa87e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -50,8 +50,6 @@ src/machine.vala
 src/main.vala
 src/media-manager.vala
 src/notificationbar.vala
-src/ovirt-broker.vala
-src/ovirt-machine.vala
 src/properties-page-widget.vala
 src/properties.vala
 src/remote-machine.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 5c4e23bd..19d32324 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -21,8 +21,6 @@ src/machine.c
 src/main.c
 src/media-manager.c
 src/notificationbar.c
-src/ovirt-broker.c
-src/ovirt-machine.c
 src/properties.c
 src/properties-page-widget.c
 src/remote-machine.c
diff --git a/src/app.vala b/src/app.vala
index 87813099..2adbd23c 100644
--- a/src/app.vala
+++ b/src/app.vala
@@ -131,9 +131,6 @@ public override void startup () {
         collection = new Collection ();
 
         brokers.insert ("libvirt", LibvirtBroker.get_default ());
-#if HAVE_OVIRT
-        brokers.insert ("ovirt", OvirtBroker.get_default ());
-#endif
 
         check_cpu_vt_capability.begin ();
         check_module_kvm_loaded.begin ();
@@ -176,7 +173,7 @@ public override void activate () {
         { "checks", 0, 0, OptionArg.NONE, null, N_("Check virtualization capabilities"), null },
         { "open-uuid", 0, 0, OptionArg.STRING, ref opt_open_uuid, N_("Open box with UUID"), null },
         { "search", 0, 0, OptionArg.STRING_ARRAY, ref opt_search, N_("Search term"), null },
-        // A 'broker' is a virtual-machine manager (local or remote). Currently libvirt and ovirt are 
supported.
+        // A 'broker' is a virtual-machine manager (local or remote). Currently only libvirt is supported.
         { "", 0, 0, OptionArg.STRING_ARRAY, ref opt_uris, N_("URL to display, broker or installer media"), 
null },
         { null }
     };
diff --git a/src/meson.build b/src/meson.build
index 3fcb359f..b485c812 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -162,20 +162,6 @@ else
     dependency ('gudev-1.0', version: '>= 165'),
   ]
 
-  if get_option('ovirt')
-    vala_sources += [
-      'ovirt-broker.vala',
-      'ovirt-machine.vala'
-    ]
-
-    vala_args += '--define=HAVE_OVIRT'
-
-    dependencies += [
-      dependency ('govirt-1.0', version: '>= 0.3.4'),
-      valac.find_library ('rest-0.7')
-    ]
-  endif
-
   if get_option('rdp')
     gtk_frdp = subproject(
       'gtk-frdp',
diff --git a/src/spice-display.vala b/src/spice-display.vala
index a0f28273..f5d6e7bd 100644
--- a/src/spice-display.vala
+++ b/src/spice-display.vala
@@ -112,7 +112,7 @@ private void main_cleanup () {
         main_cleanup ();
     }
 
-    public SpiceDisplay (Machine machine, BoxConfig config, string host, int port, int tls_port = 0, string? 
host_subject = null)
+    public SpiceDisplay (Machine machine, BoxConfig config, string host, int port, int tls_port = 0)
         requires (port != 0 || tls_port != 0) {
         this.machine = machine;
         machine.notify["ui-state"].connect (ui_state_changed);
@@ -126,14 +126,7 @@ public SpiceDisplay (Machine machine, BoxConfig config, string host, int port, i
         if (tls_port != 0)
             session.tls_port = tls_port.to_string ();
 
-        // FIXME: together with newer oVirt, libgovirt should be able
-        // to automatically provide the host subject when needed. Keep
-        // this environment variable a while longer to be able to cope
-        // with older oVirt versions.
-        if (host_subject != null)
-            session.cert_subject = host_subject;
-        else
-            session.cert_subject = GLib.Environment.get_variable ("BOXES_SPICE_HOST_SUBJECT");
+        session.cert_subject = GLib.Environment.get_variable ("BOXES_SPICE_HOST_SUBJECT");
 
         config.save_properties (gtk_session, gtk_session_saved_properties);
     }