diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-02-06 15:31:00 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2012-02-06 16:42:58 +0000 |
| commit | 8b1465614f42782f464cd6a008237711b21ac2ba (patch) | |
| tree | 9efd18cb0701bb944b30e39911fd6104017d4889 /lib | |
| parent | f012cb6b5e016c322fc0ad99f64acf132a4e1f9e (diff) | |
| download | telepathy-salut-8b1465614f42782f464cd6a008237711b21ac2ba.tar.gz | |
Update Wocky snapshot for one big header.
We have to lose the reference to wocky_heartbeat_source_new from the
symbol hack table, because it's not exposed in Wocky's public headers
any more. That's okay, though: it's not intended for use by
applications, let alone plugins.
https://bugs.freedesktop.org/show_bug.cgi?id=45703
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'lib')
| m--------- | lib/ext/wocky | 0 | ||||
| -rw-r--r-- | lib/gibber/gibber-bytestream-direct.c | 2 | ||||
| -rw-r--r-- | lib/gibber/gibber-bytestream-iface.h | 2 | ||||
| -rw-r--r-- | lib/gibber/gibber-bytestream-muc.c | 2 | ||||
| -rw-r--r-- | lib/gibber/gibber-bytestream-oob.c | 6 | ||||
| -rw-r--r-- | lib/gibber/gibber-debug.h | 2 | ||||
| -rw-r--r-- | lib/gibber/gibber-file-transfer.h | 4 | ||||
| -rw-r--r-- | lib/gibber/gibber-muc-connection.c | 4 | ||||
| -rw-r--r-- | lib/gibber/gibber-muc-connection.h | 2 | ||||
| -rw-r--r-- | lib/gibber/gibber-oob-file-transfer.c | 5 |
10 files changed, 10 insertions, 19 deletions
diff --git a/lib/ext/wocky b/lib/ext/wocky -Subproject a0e74a1cd04ab5e35922536f047664a5ce69c11 +Subproject 17af336d3fe42109e9ab067c27bd9f20a915f9e diff --git a/lib/gibber/gibber-bytestream-direct.c b/lib/gibber/gibber-bytestream-direct.c index 2537d32c..a336edda 100644 --- a/lib/gibber/gibber-bytestream-direct.c +++ b/lib/gibber/gibber-bytestream-direct.c @@ -25,7 +25,7 @@ #include <glib.h> -#include <wocky/wocky-xmpp-error.h> +#include <wocky/wocky.h> #include "gibber-sockets.h" #include "gibber-linklocal-transport.h" diff --git a/lib/gibber/gibber-bytestream-iface.h b/lib/gibber/gibber-bytestream-iface.h index 5f17ba70..3a18366f 100644 --- a/lib/gibber/gibber-bytestream-iface.h +++ b/lib/gibber/gibber-bytestream-iface.h @@ -22,7 +22,7 @@ #include <glib-object.h> -#include <wocky/wocky-stanza.h> +#include <wocky/wocky.h> G_BEGIN_DECLS diff --git a/lib/gibber/gibber-bytestream-muc.c b/lib/gibber/gibber-bytestream-muc.c index a9b79ce7..65569ab4 100644 --- a/lib/gibber/gibber-bytestream-muc.c +++ b/lib/gibber/gibber-bytestream-muc.c @@ -29,7 +29,7 @@ #include "gibber-muc-connection.h" #include "gibber-linklocal-transport.h" -#include <wocky/wocky-namespaces.h> +#include <wocky/wocky.h> #define DEBUG_FLAG DEBUG_BYTESTREAM #include "gibber-debug.h" diff --git a/lib/gibber/gibber-bytestream-oob.c b/lib/gibber/gibber-bytestream-oob.c index 7952fc1e..5a7494e6 100644 --- a/lib/gibber/gibber-bytestream-oob.c +++ b/lib/gibber/gibber-bytestream-oob.c @@ -28,11 +28,7 @@ #include <glib.h> -#include <wocky/wocky-stanza.h> -#include <wocky/wocky-porter.h> -#include <wocky/wocky-meta-porter.h> -#include <wocky/wocky-namespaces.h> -#include <wocky/wocky-xmpp-error.h> +#include <wocky/wocky.h> #include "gibber-sockets.h" #include "gibber-bytestream-iface.h" diff --git a/lib/gibber/gibber-debug.h b/lib/gibber/gibber-debug.h index 47bd7ba9..c7ec2603 100644 --- a/lib/gibber/gibber-debug.h +++ b/lib/gibber/gibber-debug.h @@ -6,7 +6,7 @@ #include <glib.h> -#include <wocky/wocky-stanza.h> +#include <wocky/wocky.h> G_BEGIN_DECLS diff --git a/lib/gibber/gibber-file-transfer.h b/lib/gibber/gibber-file-transfer.h index 1e479e6e..20e816d2 100644 --- a/lib/gibber/gibber-file-transfer.h +++ b/lib/gibber/gibber-file-transfer.h @@ -22,8 +22,8 @@ #include <glib.h> #include <glib-object.h> -#include <wocky/wocky-stanza.h> -#include <wocky/wocky-porter.h> +#include <wocky/wocky.h> +#include <wocky/wocky.h> G_BEGIN_DECLS diff --git a/lib/gibber/gibber-muc-connection.c b/lib/gibber/gibber-muc-connection.c index 39b8a27f..eb233ac8 100644 --- a/lib/gibber/gibber-muc-connection.c +++ b/lib/gibber/gibber-muc-connection.c @@ -33,9 +33,7 @@ #include "gibber-r-multicast-transport.h" #include "gibber-r-multicast-causal-transport.h" -#include <wocky/wocky-xmpp-reader.h> -#include <wocky/wocky-xmpp-writer.h> -#include <wocky/wocky-namespaces.h> +#include <wocky/wocky.h> #define ADDRESS_KEY "address" #define PORT_KEY "port" diff --git a/lib/gibber/gibber-muc-connection.h b/lib/gibber/gibber-muc-connection.h index 0f724c84..17614afa 100644 --- a/lib/gibber/gibber-muc-connection.h +++ b/lib/gibber/gibber-muc-connection.h @@ -24,7 +24,7 @@ #include <glib-object.h> #include "gibber-r-multicast-transport.h" -#include <wocky/wocky-stanza.h> +#include <wocky/wocky.h> G_BEGIN_DECLS diff --git a/lib/gibber/gibber-oob-file-transfer.c b/lib/gibber/gibber-oob-file-transfer.c index 0f723bde..4aa3fc9b 100644 --- a/lib/gibber/gibber-oob-file-transfer.c +++ b/lib/gibber/gibber-oob-file-transfer.c @@ -26,10 +26,7 @@ #include <libsoup/soup-server.h> #include <libsoup/soup-message.h> -#include <wocky/wocky-stanza.h> -#include <wocky/wocky-meta-porter.h> -#include <wocky/wocky-namespaces.h> -#include <wocky/wocky-data-form.h> +#include <wocky/wocky.h> #include "gibber-oob-file-transfer.h" #include "gibber-fd-transport.h" |