From 3eeff64419b356baf32c29324509f79b3be12ab9 Mon Sep 17 00:00:00 2001
From: Will Thompson <will@willthompson.co.uk>
Date: Mon, 6 Feb 2012 15:44:50 +0000
Subject: [PATCH] Update to use single <wocky/wocky.h> include.

---
 gabble/message-channel.c      |    7 +------
 gabble/message-channel.h      |    2 +-
 gabble/status.c               |    6 +-----
 gabble/status.h               |    2 +-
 plugin-base/caps-manager.c    |    3 +--
 plugin-base/channel-manager.c |    2 +-
 plugin-base/utils.h           |    2 +-
 salut/message-channel.c       |    6 +-----
 salut/message-channel.h       |    2 +-
 salut/status.c                |    6 +-----
 salut/status.h                |    2 +-
 11 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/gabble/message-channel.c b/gabble/message-channel.c
index 42925a6..333b129 100644
--- a/gabble/message-channel.c
+++ b/gabble/message-channel.c
@@ -49,12 +49,7 @@
 
 #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 <wocky/wocky.h>
 
 #include <gabble/plugin-connection.h>
 
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..ab1b063 100644
--- a/gabble/status.c
+++ b/gabble/status.c
@@ -30,11 +30,7 @@
 #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 <wocky/wocky.h>
 
 #include <telepathy-ytstenut-glib/telepathy-ytstenut-glib.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 5dcc003..b351cb2 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 76f99e1..87f5f86 100644
--- a/salut/message-channel.c
+++ b/salut/message-channel.c
@@ -42,11 +42,7 @@
 
 #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.h>
 
 #include <salut/connection.h>
 
diff --git a/salut/message-channel.h b/salut/message-channel.h
index a13c00d..e045b51 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/connection.h>
 
diff --git a/salut/status.c b/salut/status.c
index 9a77206..fd5d826 100644
--- a/salut/status.c
+++ b/salut/status.c
@@ -31,11 +31,7 @@
 #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 <wocky/wocky.h>
 
 #include <telepathy-ytstenut-glib/telepathy-ytstenut-glib.h>
 
diff --git a/salut/status.h b/salut/status.h
index f4e4ec0..43d3731 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/connection.h>
 
-- 
1.7.7.3