Unfortunately, there was no single-header include for the GTK+ library until just recently (spice-client-gtk.h), so this requires bumping the spice-gtk version requirement to a unreleased git version. --- Changes since v1 - don't include in-progress file-transfer files configure.ac | 2 +- src/remote-viewer-main.c | 2 +- src/virt-viewer-display-spice.c | 2 +- src/virt-viewer-display-spice.h | 3 +-- src/virt-viewer-main.c | 2 +- src/virt-viewer-session-spice.c | 7 +------ src/virt-viewer-session-spice.h | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index cf75f0e..34bf22a 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ GTK2_REQUIRED="2.18.0" GTK3_REQUIRED="3.0" GTK_VNC1_REQUIRED="0.3.8" GTK_VNC2_REQUIRED="0.4.0" -SPICE_GTK_REQUIRED="0.29.35" +SPICE_GTK_REQUIRED="0.30.6" SPICE_PROTOCOL_REQUIRED="0.12.7" GOVIRT_REQUIRED="0.3.2" diff --git a/src/remote-viewer-main.c b/src/remote-viewer-main.c index 81cf736..6ac2523 100644 --- a/src/remote-viewer-main.c +++ b/src/remote-viewer-main.c @@ -34,7 +34,7 @@ #include <vncdisplay.h> #endif #ifdef HAVE_SPICE_GTK -#include <spice-option.h> +#include <spice-client.h> #endif #ifdef HAVE_OVIRT #include <govirt/ovirt-options.h> diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-spice.c index c3dbd75..7a27847 100644 --- a/src/virt-viewer-display-spice.c +++ b/src/virt-viewer-display-spice.c @@ -25,7 +25,7 @@ #include <config.h> #include <math.h> -#include <spice-audio.h> +#include <spice-client.h> #include <glib/gi18n.h> diff --git a/src/virt-viewer-display-spice.h b/src/virt-viewer-display-spice.h index 3c30270..e6b4a05 100644 --- a/src/virt-viewer-display-spice.h +++ b/src/virt-viewer-display-spice.h @@ -25,8 +25,7 @@ #define _VIRT_VIEWER_DISPLAY_SPICE_H #include <glib-object.h> -#include <spice-widget.h> -#include <spice-audio.h> +#include <spice-client-gtk.h> #include "virt-viewer-display.h" #include "virt-viewer-session-spice.h" diff --git a/src/virt-viewer-main.c b/src/virt-viewer-main.c index 505b472..9b9807a 100644 --- a/src/virt-viewer-main.c +++ b/src/virt-viewer-main.c @@ -29,7 +29,7 @@ #include <vncdisplay.h> #endif #ifdef HAVE_SPICE_GTK -#include <spice-option.h> +#include <spice-client.h> #endif #include "virt-viewer.h" diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c index eb0761d..61c96ec 100644 --- a/src/virt-viewer-session-spice.c +++ b/src/virt-viewer-session-spice.c @@ -24,14 +24,9 @@ #include <config.h> -#include <spice-audio.h> #include <glib/gi18n.h> +#include <spice-client-gtk.h> -#include <spice-option.h> -#include <spice-util.h> -#include <spice-client.h> - -#include <usb-device-widget.h> #include "virt-viewer-file.h" #include "virt-viewer-util.h" #include "virt-viewer-session-spice.h" diff --git a/src/virt-viewer-session-spice.h b/src/virt-viewer-session-spice.h index 95bdcdf..aa1f7e8 100644 --- a/src/virt-viewer-session-spice.h +++ b/src/virt-viewer-session-spice.h @@ -25,8 +25,7 @@ #define _VIRT_VIEWER_SESSION_SPICE_H #include <glib-object.h> -#include <spice-widget.h> -#include <spice-audio.h> +#include <spice-client.h> #include "virt-viewer-session.h" -- 2.1.0 _______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list
