[Spice-devel] [PATCH] fixup! Move CursorChannelClient to separate file

[Frediano Ziglio]

Fix Makefile indentation.
Avoid exposing client stuff if not needed.
---
 server/Makefile.am             | 4 ++--
 server/cursor-channel-client.c | 1 +
 server/cursor-channel-client.h | 6 ------
 server/cursor-channel.c        | 1 +
 server/cursor-channel.h        | 9 +++++++--
 server/red-worker.c            | 1 -
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/server/Makefile.am b/server/Makefile.am
index 968829a..e48df4e 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -117,8 +117,8 @@ libserver_la_SOURCES =				\
 	red-worker.h				\
 	display-channel.c			\
 	display-channel.h			\
-	cursor-channel-client.c		\
-	cursor-channel-client.h		\
+	cursor-channel-client.c			\
+	cursor-channel-client.h			\
 	cursor-channel.c			\
 	cursor-channel.h			\
 	red-pipe-item.c				\
diff --git a/server/cursor-channel-client.c b/server/cursor-channel-client.c
index 8c26d43..8b147b6 100644
--- a/server/cursor-channel-client.c
+++ b/server/cursor-channel-client.c
@@ -24,6 +24,7 @@
 #include "red-channel-client.h"
 #include "cache-item.h"
 #include "cursor-channel.h"
+#include "cursor-channel-client.h"
 
 #define CLIENT_CURSOR_CACHE_SIZE 256
 
diff --git a/server/cursor-channel-client.h b/server/cursor-channel-client.h
index 0760f09..43dd243 100644
--- a/server/cursor-channel-client.h
+++ b/server/cursor-channel-client.h
@@ -36,12 +36,6 @@ CursorChannelClient* cursor_channel_client_new(CursorChannel *cursor,
                                                int num_common_caps,
                                                uint32_t *caps, int num_caps);
 
-/**
- * Migrate a client channel from a CursorChannel.
- * This is the equivalent of RedChannel client migrate callback.
- * See comment on cursor_channel_new.
- */
-void cursor_channel_client_migrate(RedChannelClient *rcc);
 void cursor_channel_client_reset_cursor_cache(RedChannelClient *rcc);
 void cursor_channel_client_on_disconnect(RedChannelClient *rcc);
 RedCacheItem* cursor_channel_client_cache_find(CursorChannelClient *ccc, uint64_t id);
diff --git a/server/cursor-channel.c b/server/cursor-channel.c
index bf778dd..2ecf3fe 100644
--- a/server/cursor-channel.c
+++ b/server/cursor-channel.c
@@ -23,6 +23,7 @@
 #include <common/generated_server_marshallers.h>
 
 #include "cursor-channel.h"
+#include "cursor-channel-client.h"
 #include "reds.h"
 
 typedef struct CursorChannelClient CursorChannelClient;
diff --git a/server/cursor-channel.h b/server/cursor-channel.h
index 0cff16c..6149e2d 100644
--- a/server/cursor-channel.h
+++ b/server/cursor-channel.h
@@ -18,7 +18,6 @@
 #ifndef CURSOR_CHANNEL_H_
 # define CURSOR_CHANNEL_H_
 
-#include "cursor-channel-client.h"
 #include "red-worker.h"
 
 /**
@@ -27,7 +26,6 @@
  * A pointer to CursorChannel can be converted to a RedChannel.
  */
 typedef struct CursorChannel CursorChannel;
-typedef struct CursorItem CursorItem;
 
 /**
  * Create CursorChannel.
@@ -63,4 +61,11 @@ void                 cursor_channel_connect     (CursorChannel *cursor, RedClien
                                                  uint32_t *common_caps, int num_common_caps,
                                                  uint32_t *caps, int num_caps);
 
+/**
+ * Migrate a client channel from a CursorChannel.
+ * This is the equivalent of RedChannel client migrate callback.
+ * See comment on cursor_channel_new.
+ */
+void                 cursor_channel_client_migrate(RedChannelClient *client);
+
 #endif /* CURSOR_CHANNEL_H_ */
diff --git a/server/red-worker.c b/server/red-worker.c
index eab8c64..590412b 100644
--- a/server/red-worker.c
+++ b/server/red-worker.c
@@ -50,7 +50,6 @@
 #include "spice.h"
 #include "red-worker.h"
 #include "cursor-channel.h"
-#include "cursor-channel-client.h"
 #include "tree.h"
 
 #define CMD_RING_POLL_TIMEOUT 10 //milli
-- 
2.7.4