[Spice-devel] [PATCH spice-gtk 2/2] Don't include super-header from channel-main.h

[Jonathon Jongsma]

spice-client.h is a super-header that includes all of the other public
headers (including channel-main.h). By including this from
channel-main.h, it creates a circular dependency. This was causing some
build problems with spice-audio.h:

In file included from ../../src/spice-client.h:50:0,
                 from ../../src/channel-main.h:21,
                 from ../../src/channel-main.c:25:
../../src/spice-audio.h:74:44: error: unknown type name 'SpiceMainChannel'
                                            SpiceMainChannel *main_channel,
                                            ^

Instead of including this super-header, just include the one we need:
spice-channel.h
---
 src/channel-main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/channel-main.h b/src/channel-main.h
index 86bb46b..92875dc 100644
--- a/src/channel-main.h
+++ b/src/channel-main.h
@@ -18,7 +18,7 @@
 #ifndef __SPICE_CLIENT_MAIN_CHANNEL_H__
 #define __SPICE_CLIENT_MAIN_CHANNEL_H__
 
-#include "spice-client.h"
+#include "spice-channel.h"
 
 G_BEGIN_DECLS
 
-- 
2.1.0