[virt-tools-list] [PATCH v2 virt-viewer 1/2] Fix spice includes

[Pavel Grunt]

Ack,
Pavel

On Tue, 2016-03-22 at 11:45 -0300, Eduardo Lima (Etrunko) wrote:
> Spice release version 0.31 requires that only spice-client.h or
> spice-client-gtk.h should be included directly. As a result,
> compilation is now throwing warnings like:
> 
> warning: #warning "Only <spice-client.h> can be included directly" [-
> Wcpp]
> warning: #warning "Only <spice-client-gtk.h> can be included
> directly" [-Wcpp]
> 
> This patch also bumps spice version requirement to 0.31, to ensure
> those files are available.
> 
> Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
> ---
>  configure.ac                    | 2 +-
>  src/virt-viewer-display-spice.c | 2 +-
>  src/virt-viewer-display-spice.h | 3 +--
>  src/virt-viewer-session-spice.c | 5 +----
>  src/virt-viewer-session-spice.h | 3 +--
>  5 files changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 6d8475b..115ad81 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -24,7 +24,7 @@ LIBXML2_REQUIRED="2.6.0"
>  LIBVIRT_REQUIRED="0.10.0"
>  LIBVIRT_GLIB_REQUIRED="0.1.8"
>  GTK_VNC_REQUIRED="0.4.0"
> -SPICE_GTK_REQUIRED="0.30"
> +SPICE_GTK_REQUIRED="0.31"
>  SPICE_PROTOCOL_REQUIRED="0.12.7"
>  GOVIRT_REQUIRED="0.3.2"
>  
> diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-
> display-spice.c
> index 5114833..4abab2c 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-gtk.h>
>  
>  #include <glib/gi18n.h>
>  
> diff --git a/src/virt-viewer-display-spice.h b/src/virt-viewer-
> display-spice.h
> index 3c30270..598a1b7 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.h>
>  
>  #include "virt-viewer-display.h"
>  #include "virt-viewer-session-spice.h"
> diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-
> session-spice.c
> index dc0c1ff..f7f2dc9 100644
> --- a/src/virt-viewer-session-spice.c
> +++ b/src/virt-viewer-session-spice.c
> @@ -24,12 +24,9 @@
>  
>  #include <config.h>
>  
> -#include <spice-audio.h>
>  #include <glib/gi18n.h>
>  
> -#include <spice-option.h>
> -#include <spice-util.h>
> -#include <spice-client.h>
> +#include <spice-client-gtk.h>
>  
>  #include <usb-device-widget.h>
>  #include "virt-viewer-file.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"
>