[Spice-devel] [PATCH spice-server 08/10] Include main-channel-client.h where MainChannelClient is used

[Jonathon Jongsma]

Acked-by: Jonathon Jongsma <jjongsma at redhat.com>


On Mon, 2016-10-17 at 14:26 +0100, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/dcc.c          | 1 +
>  server/main-channel.c | 3 ++-
>  server/red-qxl.c      | 1 +
>  server/reds.c         | 1 +
>  server/sound.c        | 1 +
>  server/stream.c       | 1 +
>  6 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/server/dcc.c b/server/dcc.c
> index 3519d2e..0080f10 100644
> --- a/server/dcc.c
> +++ b/server/dcc.c
> @@ -22,6 +22,7 @@
>  #include "dcc-private.h"
>  #include "display-channel.h"
>  #include "red-channel-client-private.h"
> +#include "main-channel-client.h"
>  #include "spice-server-enums.h"
>  
>  G_DEFINE_TYPE(DisplayChannelClient, display_channel_client,
> RED_TYPE_CHANNEL_CLIENT)
> diff --git a/server/main-channel.c b/server/main-channel.c
> index a1b8e31..d8ee159 100644
> --- a/server/main-channel.c
> +++ b/server/main-channel.c
> @@ -22,9 +22,10 @@
>  #include <common/ring.h>
>  
>  #include "red-common.h"
> -#include "main-channel.h"
>  #include "reds.h"
>  #include "red-channel-client.h"
> +#include "main-channel.h"
> +#include "main-channel-client.h"
>  
>  int main_channel_is_connected(MainChannel *main_chan)
>  {
> diff --git a/server/red-qxl.c b/server/red-qxl.c
> index e517b41..87d613b 100644
> --- a/server/red-qxl.c
> +++ b/server/red-qxl.c
> @@ -36,6 +36,7 @@
>  #include "reds.h"
>  #include "dispatcher.h"
>  #include "red-parse-qxl.h"
> +#include "main-channel-client.h"
>  
>  #include "red-qxl.h"
>  
> diff --git a/server/reds.c b/server/reds.c
> index 79f9c9e..aee27e5 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -73,6 +73,7 @@
>  #include "reds-private.h"
>  #include "video-encoder.h"
>  #include "red-channel-client.h"
> +#include "main-channel-client.h"
>  
>  static void reds_client_monitors_config(RedsState *reds,
> VDAgentMonitorsConfig *monitors_config);
>  static gboolean reds_use_client_monitors_config(RedsState *reds);
> diff --git a/server/sound.c b/server/sound.c
> index 4edf8ed..db23e95 100644
> --- a/server/sound.c
> +++ b/server/sound.c
> @@ -41,6 +41,7 @@
>  #include "sound.h"
>  #include <common/snd_codec.h>
>  #include "demarshallers.h"
> +#include "main-channel-client.h"
>  
>  #ifndef IOV_MAX
>  #define IOV_MAX 1024
> diff --git a/server/stream.c b/server/stream.c
> index b28c58b..6533111 100644
> --- a/server/stream.c
> +++ b/server/stream.c
> @@ -20,6 +20,7 @@
>  
>  #include "stream.h"
>  #include "display-channel.h"
> +#include "main-channel-client.h"
>  
>  #define FPS_TEST_INTERVAL 1
>  #define FOREACH_STREAMS(display, item)                  \