From 1741adad14a19046aaea8109751d6f7680df0631 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 16 Jan 2013 10:41:32 +0000 Subject: Update Wocky snapshot for wocky.h with Jingle headers --- lib/ext/wocky | 2 +- src/base-call-channel.c | 1 - src/base-call-channel.h | 2 +- src/call-channel.c | 2 +- src/call-content.c | 3 --- src/call-content.h | 2 +- src/call-member-content.c | 1 - src/call-member-content.h | 3 +-- src/call-member.h | 2 +- src/call-muc-channel.c | 1 - src/call-muc-channel.h | 2 +- src/call-stream.c | 2 -- src/call-stream.h | 3 +-- src/connection.c | 1 - src/ft-manager.c | 1 - src/gtalk-file-collection.c | 2 -- src/gtalk-file-collection.h | 2 +- src/jingle-mint.c | 2 -- src/jingle-mint.h | 3 +-- src/jingle-share.c | 3 --- src/jingle-share.h | 4 +--- src/jingle-tp-util.h | 2 +- src/media-channel-internal.h | 3 +-- src/media-channel.c | 6 ++---- src/media-factory.c | 5 ++--- src/media-stream.c | 3 --- src/media-stream.h | 3 +-- src/muc-factory.h | 3 --- src/util.h | 5 ----- tests/twisted/main-debug.c | 4 ---- 30 files changed, 18 insertions(+), 60 deletions(-) diff --git a/lib/ext/wocky b/lib/ext/wocky index aaefe6f7b..a38dbe13e 160000 --- a/lib/ext/wocky +++ b/lib/ext/wocky @@ -1 +1 @@ -Subproject commit aaefe6f7bb05c1b6900586b6af20716dbd133f57 +Subproject commit a38dbe13ebf4eef59fbd1a868464987e204ea609 diff --git a/src/base-call-channel.c b/src/base-call-channel.c index e4560eddf..3a1c8045a 100644 --- a/src/base-call-channel.c +++ b/src/base-call-channel.c @@ -33,7 +33,6 @@ #include "base-call-channel.h" #include "connection.h" -#include "jingle-session.h" #include "jingle-tp-util.h" #define DEBUG_FLAG GABBLE_DEBUG_MEDIA diff --git a/src/base-call-channel.h b/src/base-call-channel.h index 25bbe67d4..065b03786 100644 --- a/src/base-call-channel.h +++ b/src/base-call-channel.h @@ -25,8 +25,8 @@ #include #include +#include -#include "jingle-content.h" #include "call-member.h" #include "call-content.h" diff --git a/src/call-channel.c b/src/call-channel.c index e49a51837..6e247aa0d 100644 --- a/src/call-channel.c +++ b/src/call-channel.c @@ -28,13 +28,13 @@ #include #include +#include #include "util.h" #include "call-channel.h" #include "call-content.h" #include "connection.h" -#include "jingle-session.h" #include "jingle-tp-util.h" #include "presence-cache.h" diff --git a/src/call-content.c b/src/call-content.c index b7d7e186e..827dc2445 100644 --- a/src/call-content.c +++ b/src/call-content.c @@ -29,9 +29,6 @@ #include "call-member.h" #include "call-content.h" #include "call-stream.h" -#include "jingle-content.h" -#include "jingle-session.h" -#include "jingle-media-rtp.h" #include "jingle-tp-util.h" #include "connection.h" #include "util.h" diff --git a/src/call-content.h b/src/call-content.h index 97202c940..e675d57fa 100644 --- a/src/call-content.h +++ b/src/call-content.h @@ -24,8 +24,8 @@ #include #include +#include -#include "jingle-content.h" #include "call-member-content.h" G_BEGIN_DECLS diff --git a/src/call-member-content.c b/src/call-member-content.c index bbd082384..4500de14c 100644 --- a/src/call-member-content.c +++ b/src/call-member-content.c @@ -25,7 +25,6 @@ #include "call-member.h" #include "call-member-content.h" -#include "jingle-media-rtp.h" #include "util.h" #include "namespaces.h" diff --git a/src/call-member-content.h b/src/call-member-content.h index cab3c708a..0f47d61ab 100644 --- a/src/call-member-content.h +++ b/src/call-member-content.h @@ -22,10 +22,9 @@ #define __CALL_MEMBER_CONTENT_H__ #include +#include #include "types.h" -#include "jingle-content.h" -#include "jingle-media-rtp.h" G_BEGIN_DECLS diff --git a/src/call-member.h b/src/call-member.h index 4215222ff..bc8afe027 100644 --- a/src/call-member.h +++ b/src/call-member.h @@ -24,9 +24,9 @@ #include #include +#include #include "types.h" -#include "jingle-session.h" #include "call-member-content.h" G_BEGIN_DECLS diff --git a/src/call-muc-channel.c b/src/call-muc-channel.c index 909fe219c..1dbf3b23c 100644 --- a/src/call-muc-channel.c +++ b/src/call-muc-channel.c @@ -26,7 +26,6 @@ #include #include -#include #include "call-content.h" #include "muc-channel.h" diff --git a/src/call-muc-channel.h b/src/call-muc-channel.h index 34837b653..e3df68235 100644 --- a/src/call-muc-channel.h +++ b/src/call-muc-channel.h @@ -22,9 +22,9 @@ #define __GABBLE_CALL_MUC_CHANNEL_H__ #include +#include #include "base-call-channel.h" -#include "jingle-session.h" G_BEGIN_DECLS diff --git a/src/call-stream.c b/src/call-stream.c index 3cb3b1b76..89af93ce1 100644 --- a/src/call-stream.c +++ b/src/call-stream.c @@ -28,8 +28,6 @@ #include "call-stream.h" #include "connection.h" -#include "jingle-session.h" -#include "jingle-content.h" #include "jingle-tp-util.h" #include "util.h" diff --git a/src/call-stream.h b/src/call-stream.h index 61f407514..e83a50c7a 100644 --- a/src/call-stream.h +++ b/src/call-stream.h @@ -24,8 +24,7 @@ #include #include - -#include "jingle-types.h" +#include G_BEGIN_DECLS diff --git a/src/connection.c b/src/connection.c index db64bd278..cc15a0adc 100644 --- a/src/connection.c +++ b/src/connection.c @@ -77,7 +77,6 @@ #ifdef ENABLE_VOIP #include "media-channel.h" -#include "jingle-factory.h" #include "media-factory.h" #endif diff --git a/src/ft-manager.c b/src/ft-manager.c index 8685e03f7..a4266b5a0 100644 --- a/src/ft-manager.c +++ b/src/ft-manager.c @@ -31,7 +31,6 @@ #include #ifdef ENABLE_JINGLE_FILE_TRANSFER -#include "jingle-session.h" #include "jingle-share.h" #endif #include "gabble/caps-channel-manager.h" diff --git a/src/gtalk-file-collection.c b/src/gtalk-file-collection.c index f5591213e..6626fd0e3 100644 --- a/src/gtalk-file-collection.c +++ b/src/gtalk-file-collection.c @@ -29,8 +29,6 @@ #define DEBUG_FLAG GABBLE_DEBUG_SHARE #include "debug.h" -#include "jingle-factory.h" -#include "jingle-session.h" #include "jingle-share.h" #include "namespaces.h" #include "util.h" diff --git a/src/gtalk-file-collection.h b/src/gtalk-file-collection.h index 7f835d257..b1e784fc2 100644 --- a/src/gtalk-file-collection.h +++ b/src/gtalk-file-collection.h @@ -21,7 +21,7 @@ #define __GTALK_FILE_COLLECTION_H__ #include -#include "jingle-session.h" +#include #include "connection.h" typedef struct _GTalkFileCollection GTalkFileCollection; diff --git a/src/jingle-mint.c b/src/jingle-mint.c index 2362cdec0..f41a504ea 100644 --- a/src/jingle-mint.c +++ b/src/jingle-mint.c @@ -32,8 +32,6 @@ #include "connection.h" #include "conn-presence.h" -#include "jingle-factory.h" -#include "jingle-session.h" #include "jingle-share.h" #include "presence-cache.h" diff --git a/src/jingle-mint.h b/src/jingle-mint.h index 0b2e2ed0d..6f7685077 100644 --- a/src/jingle-mint.h +++ b/src/jingle-mint.h @@ -23,8 +23,7 @@ #include #include "types.h" -#include "jingle-info.h" -#include "jingle-types.h" +#include typedef struct _GabbleJingleMint GabbleJingleMint; typedef struct _GabbleJingleMintClass GabbleJingleMintClass; diff --git a/src/jingle-share.c b/src/jingle-share.c index ae4e25422..a4909f2b0 100644 --- a/src/jingle-share.c +++ b/src/jingle-share.c @@ -34,9 +34,6 @@ #include "connection.h" #include "debug.h" -#include "jingle-content.h" -#include "jingle-factory.h" -#include "jingle-session.h" #include "namespaces.h" #include "util.h" diff --git a/src/jingle-share.h b/src/jingle-share.h index cb4f99464..06066c987 100644 --- a/src/jingle-share.h +++ b/src/jingle-share.h @@ -21,9 +21,7 @@ #define __JINGLE_SHARE_H__ #include - -#include "jingle-content.h" -#include "jingle-types.h" +#include G_BEGIN_DECLS diff --git a/src/jingle-tp-util.h b/src/jingle-tp-util.h index e26ed55f7..47091c53a 100644 --- a/src/jingle-tp-util.h +++ b/src/jingle-tp-util.h @@ -21,7 +21,7 @@ #define GABBLE_JINGLE_TP_UTIL_H #include -#include "jingle-content.h" +#include WockyJingleMediaType wocky_jingle_media_type_from_tp (TpMediaStreamType type); TpMediaStreamType wocky_jingle_media_type_to_tp (WockyJingleMediaType type); diff --git a/src/media-channel-internal.h b/src/media-channel-internal.h index 76bba4c15..4459df726 100644 --- a/src/media-channel-internal.h +++ b/src/media-channel-internal.h @@ -27,10 +27,9 @@ #include #include +#include #include "media-stream.h" -#include "jingle-session.h" -#include "jingle-media-rtp.h" G_BEGIN_DECLS diff --git a/src/media-channel.c b/src/media-channel.c index 56fb3f259..c4ab89e37 100644 --- a/src/media-channel.c +++ b/src/media-channel.c @@ -29,14 +29,12 @@ #include #include +#include + #define DEBUG_FLAG GABBLE_DEBUG_MEDIA #include "connection.h" #include "debug.h" -#include "jingle-content.h" -#include "jingle-factory.h" -#include "jingle-media-rtp.h" -#include "jingle-session.h" #include "jingle-tp-util.h" #include "media-factory.h" #include "media-stream.h" diff --git a/src/media-factory.c b/src/media-factory.c index c17e5dde1..85e4a1c46 100644 --- a/src/media-factory.c +++ b/src/media-factory.c @@ -29,14 +29,13 @@ #include #include +#include + #define DEBUG_FLAG GABBLE_DEBUG_MEDIA #include "gabble/caps-channel-manager.h" #include "connection.h" #include "debug.h" -#include "jingle-factory.h" -#include "jingle-media-rtp.h" -#include "jingle-session.h" #include "call-channel.h" #include "media-channel.h" diff --git a/src/media-stream.c b/src/media-stream.c index 2ee73c048..426aa8a20 100644 --- a/src/media-stream.c +++ b/src/media-stream.c @@ -36,9 +36,6 @@ #include "connection.h" #include "debug.h" #include "gabble-signals-marshal.h" -#include "jingle-content.h" -#include "jingle-session.h" -#include "jingle-media-rtp.h" #include "media-channel.h" #include "namespaces.h" #include "util.h" diff --git a/src/media-stream.h b/src/media-stream.h index 1543a9dae..2174f52df 100644 --- a/src/media-stream.h +++ b/src/media-stream.h @@ -23,8 +23,7 @@ #include #include - -#include "jingle-types.h" +#include G_BEGIN_DECLS diff --git a/src/muc-factory.h b/src/muc-factory.h index aac76c4c2..507ae5298 100644 --- a/src/muc-factory.h +++ b/src/muc-factory.h @@ -26,9 +26,6 @@ #include #include "bytestream-iface.h" -#ifdef ENABLE_VOIP -#include "jingle-types.h" -#endif #include "types.h" G_BEGIN_DECLS diff --git a/src/util.h b/src/util.h index 594205c00..e01ff7e50 100644 --- a/src/util.h +++ b/src/util.h @@ -28,11 +28,6 @@ #include #include -#ifdef ENABLE_VOIP -#include "jingle-factory.h" -#include "jingle-content.h" -#endif - #include "types.h" /* Guarantees that the resulting hash is in lower-case */ diff --git a/tests/twisted/main-debug.c b/tests/twisted/main-debug.c index 56334c591..8bc16ff90 100644 --- a/tests/twisted/main-debug.c +++ b/tests/twisted/main-debug.c @@ -31,10 +31,6 @@ #include "gabble.h" #include "connection.h" #include "vcard-manager.h" -#ifdef ENABLE_VOIP -#include "jingle-factory.h" -#include "jingle-session.h" -#endif #ifdef ENABLE_JINGLE_FILE_TRANSFER #include "gtalk-file-collection.h" #endif -- cgit v1.2.3