summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Soliverez <alvaro.soliverez@collabora.co.uk>2012-02-16 15:46:52 -0300
committerAlvaro Soliverez <alvaro.soliverez@collabora.co.uk>2012-02-16 15:46:52 -0300
commit0a521ad35f8a04345fb35c1c560d2aaa788072dc (patch)
tree15ed73a095178344bddc2b2d80fef09967027471
parentb3473e966a1fcd16d6e3a7e49a4ea9fa254405a9 (diff)
Fixed wocky includes
-rw-r--r--gabble/message-channel.c7
-rw-r--r--gabble/message-channel.h2
-rw-r--r--gabble/status.c6
-rw-r--r--gabble/status.h2
-rw-r--r--plugin-base/caps-manager.c3
-rw-r--r--plugin-base/channel-manager.c2
-rw-r--r--plugin-base/utils.h2
-rw-r--r--salut/message-channel.c6
-rw-r--r--salut/message-channel.h2
-rw-r--r--salut/status.c6
-rw-r--r--salut/status.h2
11 files changed, 7 insertions, 33 deletions
diff --git a/gabble/message-channel.c b/gabble/message-channel.c
index 42925a6..b20ce2b 100644
--- a/gabble/message-channel.c
+++ b/gabble/message-channel.c
@@ -49,13 +49,6 @@
#include <telepathy-ytstenut-glib/telepathy-ytstenut-glib.h>
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-xmpp-reader.h>
-#include <wocky/wocky-xmpp-writer.h>
-#include <wocky/wocky-xmpp-error-enumtypes.h>
-#include <wocky/wocky-session.h>
-
#include <gabble/plugin-connection.h>
#define DEBUG(msg, ...) \
diff --git a/gabble/message-channel.h b/gabble/message-channel.h
index 07e956d..3906550 100644
--- a/gabble/message-channel.h
+++ b/gabble/message-channel.h
@@ -25,7 +25,7 @@
#include <telepathy-glib/base-channel.h>
-#include <wocky/wocky-stanza.h>
+#include <wocky/wocky.h>
#include <gabble/plugin-connection.h>
diff --git a/gabble/status.c b/gabble/status.c
index 1ede46a..a0e445f 100644
--- a/gabble/status.c
+++ b/gabble/status.c
@@ -30,12 +30,6 @@
#include <telepathy-glib/svc-generic.h>
#include <telepathy-glib/gtypes.h>
-#include <wocky/wocky-pubsub-helpers.h>
-#include <wocky/wocky-xmpp-reader.h>
-#include <wocky/wocky-xmpp-writer.h>
-#include <wocky/wocky-xep-0115-capabilities.h>
-#include <wocky/wocky-data-form.h>
-
#include <telepathy-ytstenut-glib/telepathy-ytstenut-glib.h>
#include "utils.h"
diff --git a/gabble/status.h b/gabble/status.h
index 9b77d0a..da1e9c7 100644
--- a/gabble/status.h
+++ b/gabble/status.h
@@ -25,7 +25,7 @@
#include <telepathy-glib/base-channel.h>
-#include <wocky/wocky-session.h>
+#include <wocky/wocky.h>
#include <gabble/plugin-connection.h>
diff --git a/plugin-base/caps-manager.c b/plugin-base/caps-manager.c
index 849c6ff..cf8c8e0 100644
--- a/plugin-base/caps-manager.c
+++ b/plugin-base/caps-manager.c
@@ -31,8 +31,7 @@
#include <telepathy-ytstenut-glib/telepathy-ytstenut-glib.h>
-#include <wocky/wocky-data-form.h>
-#include <wocky/wocky-namespaces.h>
+#include <wocky/wocky.h>
#ifdef SALUT
#include <salut/caps-channel-manager.h>
diff --git a/plugin-base/channel-manager.c b/plugin-base/channel-manager.c
index a2ad696..e92441b 100644
--- a/plugin-base/channel-manager.c
+++ b/plugin-base/channel-manager.c
@@ -32,7 +32,7 @@
#include <telepathy-glib/interfaces.h>
#include <telepathy-glib/util.h>
-#include <wocky/wocky-session.h>
+#include <wocky/wocky.h>
#ifdef SALUT
#include <salut/caps-channel-manager.h>
diff --git a/plugin-base/utils.h b/plugin-base/utils.h
index 48ae2ac..e8072d2 100644
--- a/plugin-base/utils.h
+++ b/plugin-base/utils.h
@@ -22,7 +22,7 @@
#include <glib-object.h>
-#include <wocky/wocky-xmpp-error.h>
+#include <wocky/wocky.h>
G_BEGIN_DECLS
diff --git a/salut/message-channel.c b/salut/message-channel.c
index bd75a9d..8313bda 100644
--- a/salut/message-channel.c
+++ b/salut/message-channel.c
@@ -42,12 +42,6 @@
#include <telepathy-ytstenut-glib/telepathy-ytstenut-glib.h>
-#include <wocky/wocky-namespaces.h>
-#include <wocky/wocky-utils.h>
-#include <wocky/wocky-xmpp-reader.h>
-#include <wocky/wocky-xmpp-writer.h>
-#include <wocky/wocky-xmpp-error-enumtypes.h>
-
#include <salut/plugin-connection.h>
#define DEBUG(msg, ...) \
diff --git a/salut/message-channel.h b/salut/message-channel.h
index 6bf2cac..1742ad9 100644
--- a/salut/message-channel.h
+++ b/salut/message-channel.h
@@ -25,7 +25,7 @@
#include <telepathy-glib/base-channel.h>
-#include <wocky/wocky-ll-contact.h>
+#include <wocky/wocky.h>
#include <salut/plugin-connection.h>
diff --git a/salut/status.c b/salut/status.c
index 5565905..6125302 100644
--- a/salut/status.c
+++ b/salut/status.c
@@ -31,12 +31,6 @@
#include <telepathy-glib/svc-generic.h>
#include <telepathy-glib/gtypes.h>
-#include <wocky/wocky-pubsub-helpers.h>
-#include <wocky/wocky-xmpp-reader.h>
-#include <wocky/wocky-xmpp-writer.h>
-#include <wocky/wocky-xep-0115-capabilities.h>
-#include <wocky/wocky-data-form.h>
-
#include <telepathy-ytstenut-glib/telepathy-ytstenut-glib.h>
#include "utils.h"
diff --git a/salut/status.h b/salut/status.h
index ddd3d8e..a6dda56 100644
--- a/salut/status.h
+++ b/salut/status.h
@@ -25,7 +25,7 @@
#include <telepathy-glib/base-channel.h>
-#include <wocky/wocky-session.h>
+#include <wocky/wocky.h>
#include <salut/plugin-connection.h>