all: use the new single header includes for tp-glib

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

20 files changed, 28 insertions, 37 deletions

diff --git a/src/test-api.c b/src/test-api.c
index 1f8f6cf..a39ecf2 100644
--- a/src/test-api.c
+++ b/src/test-api.c
@@ -22,6 +22,7 @@
 #include <glib.h>
 
 #include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 #include <telepathy-glib/proxy-subclass.h>
 
 #include <telepathy-logger/dbus-service-internal.h>
diff --git a/telepathy-logger/call-channel.c b/telepathy-logger/call-channel.c
index 0413b35..90446d0 100644
--- a/telepathy-logger/call-channel.c
+++ b/telepathy-logger/call-channel.c
@@ -23,6 +23,7 @@
 
 #include <glib.h>
 #include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 #include <telepathy-glib/proxy-subclass.h>
 
 #include "call-event.h"
diff --git a/telepathy-logger/client-factory.c b/telepathy-logger/client-factory.c
index 0d4b131..e698cc1 100644
--- a/telepathy-logger/client-factory.c
+++ b/telepathy-logger/client-factory.c
@@ -22,6 +22,7 @@
 #include "client-factory-internal.h"
 
 #include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include <telepathy-logger/text-channel-internal.h>
 #include <telepathy-logger/call-channel-internal.h>
diff --git a/telepathy-logger/log-store-sqlite.c b/telepathy-logger/log-store-sqlite.c
index 1c0f11f..31eb53a 100644
--- a/telepathy-logger/log-store-sqlite.c
+++ b/telepathy-logger/log-store-sqlite.c
@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 #include <sqlite3.h>
 
 #include "event-internal.h"
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index bde4ca5..3528d53 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -35,6 +35,7 @@
 #include <libxml/tree.h>
 
 #include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "telepathy-logger/call-event.h"
 #include "telepathy-logger/call-event-internal.h"
diff --git a/telepathy-logger/text-channel.c b/telepathy-logger/text-channel.c
index 546bce4..eb2ae7d 100644
--- a/telepathy-logger/text-channel.c
+++ b/telepathy-logger/text-channel.c
@@ -24,6 +24,7 @@
 
 #include <glib.h>
 #include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "action-chain-internal.h"
 #include "entity-internal.h"
diff --git a/tests/dbus/test-log-manager.c b/tests/dbus/test-log-manager.c
index c3a91a6..768419c 100644
--- a/tests/dbus/test-log-manager.c
+++ b/tests/dbus/test-log-manager.c
@@ -8,7 +8,8 @@
 #include "telepathy-logger/log-manager-internal.h"
 #include "telepathy-logger/log-store-internal.h"
 
-#include <telepathy-glib/debug-sender.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 /* it was defined in telepathy-logger/log-manager.c */
 #undef DEBUG_FLAG
diff --git a/tests/dbus/test-tpl-log-store-pidgin.c b/tests/dbus/test-tpl-log-store-pidgin.c
index 416a9b2..3760cc5 100644
--- a/tests/dbus/test-tpl-log-store-pidgin.c
+++ b/tests/dbus/test-tpl-log-store-pidgin.c
@@ -10,7 +10,8 @@
 #include <telepathy-logger/log-store-pidgin-internal.h>
 #include <telepathy-logger/text-event-internal.h>
 
-#include <telepathy-glib/debug-sender.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 /* it was defined in telepathy-logger/log-store-pidgin.c */
 #undef DEBUG_FLAG
diff --git a/tests/dbus/test-tpl-log-store-sqlite.c b/tests/dbus/test-tpl-log-store-sqlite.c
index 3d887d9..f23e832 100644
--- a/tests/dbus/test-tpl-log-store-sqlite.c
+++ b/tests/dbus/test-tpl-log-store-sqlite.c
@@ -1,5 +1,7 @@
 #include "config.h"
 
+#include <telepathy-glib/telepathy-glib-dbus.h>
+
 #include <telepathy-logger/log-store-sqlite-internal.h>
 #include <telepathy-logger/debug-internal.h>
 
diff --git a/tests/dbus/test-tpl-log-store-xml.c b/tests/dbus/test-tpl-log-store-xml.c
index f35b4a7..ead136a 100644
--- a/tests/dbus/test-tpl-log-store-xml.c
+++ b/tests/dbus/test-tpl-log-store-xml.c
@@ -6,7 +6,8 @@
 #include "telepathy-logger/log-manager-internal.h"
 #include "telepathy-logger/log-store-internal.h"
 
-#include <telepathy-glib/debug-sender.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 #include <glib.h>
 
 /* it was defined in telepathy-logger/log-store-xml.c */
diff --git a/tests/lib/contacts-conn.c b/tests/lib/contacts-conn.c
index 3b25172..76ce98e 100644
--- a/tests/lib/contacts-conn.c
+++ b/tests/lib/contacts-conn.c
@@ -14,12 +14,8 @@
 
 #include <dbus/dbus-glib.h>
 
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/handle-repo-dynamic.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 static void init_aliasing (gpointer, gpointer);
 static void init_avatars (gpointer, gpointer);
diff --git a/tests/lib/contacts-conn.h b/tests/lib/contacts-conn.h
index baab460..461cfb6 100644
--- a/tests/lib/contacts-conn.h
+++ b/tests/lib/contacts-conn.h
@@ -13,9 +13,7 @@
 #define __TP_TESTS_CONTACTS_CONN_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/contacts-mixin.h>
-#include <telepathy-glib/presence-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "simple-conn.h"
 
diff --git a/tests/lib/simple-account-manager.c b/tests/lib/simple-account-manager.c
index e1d1611..a56c96e 100644
--- a/tests/lib/simple-account-manager.c
+++ b/tests/lib/simple-account-manager.c
@@ -11,10 +11,8 @@
 
 #include "simple-account-manager.h"
 
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-generic.h>
-#include <telepathy-glib/svc-account-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 static void account_manager_iface_init (gpointer, gpointer);
 
diff --git a/tests/lib/simple-account-manager.h b/tests/lib/simple-account-manager.h
index b4f787c..5b9d2a4 100644
--- a/tests/lib/simple-account-manager.h
+++ b/tests/lib/simple-account-manager.h
@@ -13,7 +13,7 @@
 #define __TP_TESTS_SIMPLE_ACCOUNT_MANAGER_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 
 G_BEGIN_DECLS
diff --git a/tests/lib/simple-account.c b/tests/lib/simple-account.c
index 8b25af2..9a298ad 100644
--- a/tests/lib/simple-account.c
+++ b/tests/lib/simple-account.c
@@ -10,14 +10,8 @@
 
 #include "simple-account.h"
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/defs.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/svc-generic.h>
-#include <telepathy-glib/svc-account.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 static void account_iface_init (gpointer, gpointer);
 
diff --git a/tests/lib/simple-account.h b/tests/lib/simple-account.h
index 7af263d..04dfcb2 100644
--- a/tests/lib/simple-account.h
+++ b/tests/lib/simple-account.h
@@ -12,8 +12,8 @@
 #define __TP_TESTS_SIMPLE_ACCOUNT_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
 
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/simple-conn.c b/tests/lib/simple-conn.c
index 11cc7f5..a3e9757 100644
--- a/tests/lib/simple-conn.c
+++ b/tests/lib/simple-conn.c
@@ -17,15 +17,8 @@
 
 #include <dbus/dbus-glib.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/handle-repo-dynamic.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
-
-#include "textchan-null.h"
-#include "util.h"
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 static void conn_iface_init (TpSvcConnectionClass *);
 
diff --git a/tests/lib/simple-conn.h b/tests/lib/simple-conn.h
index 6322f4b..14a095b 100644
--- a/tests/lib/simple-conn.h
+++ b/tests/lib/simple-conn.h
@@ -13,7 +13,7 @@
 #define __TP_TESTS_SIMPLE_CONN_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/lib/util.c b/tests/lib/util.c
index 690365c..653abef 100644
--- a/tests/lib/util.c
+++ b/tests/lib/util.c
@@ -12,6 +12,8 @@
 
 #include "util.h"
 
+#include <telepathy-glib/telepathy-glib-dbus.h>
+
 #ifdef G_OS_UNIX
 # include <unistd.h> /* for alarm() */
 #endif
diff --git a/tests/lib/util.h b/tests/lib/util.h
index 7eab77d..e9c8f8c 100644
--- a/tests/lib/util.h
+++ b/tests/lib/util.h
@@ -12,7 +12,6 @@
 #define __TP_TESTS_LIB_UTIL_H__
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/base-connection.h>
 
 TpDBusDaemon *tp_tests_dbus_daemon_dup_or_die (void);