[telepathy-gabble/master] Move GabbleTubesChannel typedef to types.h header to break circular dependdency.
Vivek Dasmohapatra
vivek at collabora.co.uk
Sun Dec 27 11:33:11 PST 2009
---
src/tubes-channel.h | 2 +-
src/types.h | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/tubes-channel.h b/src/tubes-channel.h
index aca98c1..e00ac14 100644
--- a/src/tubes-channel.h
+++ b/src/tubes-channel.h
@@ -29,10 +29,10 @@
#include "bytestream-iface.h"
#include "muc-channel.h"
#include "tube-iface.h"
+#include "types.h"
G_BEGIN_DECLS
-typedef struct _GabbleTubesChannel GabbleTubesChannel;
typedef struct _GabbleTubesChannelPrivate GabbleTubesChannelPrivate;
typedef struct _GabbleTubesChannelClass GabbleTubesChannelClass;
diff --git a/src/types.h b/src/types.h
index 01d8a4d..bb7b8c8 100644
--- a/src/types.h
+++ b/src/types.h
@@ -42,6 +42,7 @@ typedef struct _GabbleRequestPipeline GabbleRequestPipeline;
typedef struct _GabbleOlpcView GabbleOlpcView;
typedef struct _GabbleOlpcGadgetManager GabbleOlpcGadgetManager;
+typedef struct _GabbleTubesChannel GabbleTubesChannel;
typedef struct _GabbleJingleFactory GabbleJingleFactory;
typedef struct _GabbleJingleSession GabbleJingleSession;
--
1.5.6.5
More information about the telepathy-commits
mailing list