[Spice-devel] [spice-gtk PATCH v1] webdav: keep phodav requirements inside USE_PHODAV

[Marc-André Lureau]

ack

----- Original Message -----
> Commit 33d4016228798108250b0ef9173f2c4c719a5065 uses
> g_output_stream_write_all_async/finish which is on gio 2.44 version.
> This breaks the build on older systems even if --disable-webdav is used.
> 
> Using #USE_PHODAV to wrap those functions that will not be called
> without --enable-webdav.
> ---
>  src/channel-webdav.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/src/channel-webdav.c b/src/channel-webdav.c
> index bde728e..06db70d 100644
> --- a/src/channel-webdav.c
> +++ b/src/channel-webdav.c
> @@ -297,6 +297,7 @@ static void client_start_read(SpiceWebdavChannel *self,
> Client *client)
>  
>  static void start_demux(SpiceWebdavChannel *self);
>  
> +#ifdef USE_PHODAV
>  static void demux_to_client_finish(SpiceWebdavChannel *self,
>                                     Client *client, gboolean fail)
>  {
> @@ -329,10 +330,12 @@ static void demux_to_client_cb(GObject *source,
> GAsyncResult *result, gpointer u
>      g_warn_if_fail(size == c->demux.size);
>      demux_to_client_finish(client->self, client, fail);
>  }
> +#endif
>  
>  static void demux_to_client(SpiceWebdavChannel *self,
>                              Client *client)
>  {
> +#ifdef USE_PHODAV
>      SpiceWebdavChannelPrivate *c = self->priv;
>      gsize size = c->demux.size;
>  
> @@ -347,6 +350,7 @@ static void demux_to_client(SpiceWebdavChannel *self,
>          /* Nothing to write */
>          demux_to_client_finish(self, client, FALSE);
>      }
> +#endif
>  }
>  
>  static void start_client(SpiceWebdavChannel *self)
> --
> 2.4.2
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>