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 /salut | |
| 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 'salut')
| -rw-r--r-- | salut/capability-set.h | 2 | ||||
| -rw-r--r-- | salut/connection.h | 2 | ||||
| -rw-r--r-- | salut/plugin.h | 2 | ||||
| -rw-r--r-- | salut/util.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/salut/capability-set.h b/salut/capability-set.h index 3f215259..bc10c13f 100644 --- a/salut/capability-set.h +++ b/salut/capability-set.h @@ -23,7 +23,7 @@ #include <glib-object.h> -#include <wocky/wocky-node.h> +#include <wocky/wocky.h> G_BEGIN_DECLS diff --git a/salut/connection.h b/salut/connection.h index f36e13a3..0e292c0a 100644 --- a/salut/connection.h +++ b/salut/connection.h @@ -21,7 +21,7 @@ #ifndef SALUT_PLUGINS_CONNECTION_H #define SALUT_PLUGINS_CONNECTION_H -#include <wocky/wocky-session.h> +#include <wocky/wocky.h> G_BEGIN_DECLS diff --git a/salut/plugin.h b/salut/plugin.h index c0f2a062..a7c06bb7 100644 --- a/salut/plugin.h +++ b/salut/plugin.h @@ -26,7 +26,7 @@ #include <telepathy-glib/base-connection-manager.h> #include <telepathy-glib/base-connection.h> -#include <wocky/wocky-session.h> +#include <wocky/wocky.h> #include <salut/connection.h> #include <salut/sidecar.h> diff --git a/salut/util.h b/salut/util.h index 5746c5b2..977e0b49 100644 --- a/salut/util.h +++ b/salut/util.h @@ -20,8 +20,8 @@ #ifndef SALUT_UTIL_H #define SALUT_UTIL_H -#include <wocky/wocky-stanza.h> -#include <wocky/wocky-session.h> +#include <wocky/wocky.h> +#include <wocky/wocky.h> void salut_send_ll_pep_event (WockySession *session, WockyStanza *stanza); |