Move dbus-glib header inclusion from headers to source codewip-gdbus3

Ideally, it should be possible to use telepathy-glib's high-level API
without being aware of dbus-glib at all.

33 files changed, 43 insertions, 15 deletions

diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c
index 8b92815c5..5de6f7ded 100644
--- a/telepathy-glib/account-channel-request.c
+++ b/telepathy-glib/account-channel-request.c
@@ -76,6 +76,8 @@
 #include "telepathy-glib/account-channel-request.h"
 #include "telepathy-glib/account-channel-request-internal.h"
 
+#include <dbus/dbus-glib.h>
+
 #include "telepathy-glib/base-client-internal.h"
 #include <telepathy-glib/channel-dispatcher.h>
 #include <telepathy-glib/channel-request.h>
diff --git a/telepathy-glib/account-request.c b/telepathy-glib/account-request.c
index 45a59f305..97fd9b4cc 100644
--- a/telepathy-glib/account-request.c
+++ b/telepathy-glib/account-request.c
@@ -22,6 +22,8 @@
 
 #include "telepathy-glib/account-request.h"
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/cli-misc.h>
 #include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/interfaces.h>
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 744153388..31393c405 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -26,6 +26,8 @@
 #include "telepathy-glib/account-internal.h"
 #include "telepathy-glib/account.h"
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/cli-misc.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/defs.h>
diff --git a/telepathy-glib/add-dispatch-operation-context-internal.h b/telepathy-glib/add-dispatch-operation-context-internal.h
index c186ad8b1..5b21a2752 100644
--- a/telepathy-glib/add-dispatch-operation-context-internal.h
+++ b/telepathy-glib/add-dispatch-operation-context-internal.h
@@ -22,8 +22,6 @@
 #ifndef __TP_ADD_DISPATCH_OPERATION_CONTEXT_INTERNAL_H__
 #define __TP_ADD_DISPATCH_OPERATION_CONTEXT_INTERNAL_H__
 
-#include <dbus/dbus-glib.h>
-
 #include <telepathy-glib/account.h>
 #include <telepathy-glib/add-dispatch-operation-context.h>
 #include <telepathy-glib/channel-dispatch-operation.h>
diff --git a/telepathy-glib/base-client.h b/telepathy-glib/base-client.h
index 1d01149fc..e14bb7578 100644
--- a/telepathy-glib/base-client.h
+++ b/telepathy-glib/base-client.h
@@ -25,7 +25,6 @@
 #ifndef __TP_BASE_CLIENT_H__
 #define __TP_BASE_CLIENT_H__
 
-#include <dbus/dbus-glib.h>
 #include <glib-object.h>
 
 #include <telepathy-glib/account.h>
diff --git a/telepathy-glib/base-connection-manager.h b/telepathy-glib/base-connection-manager.h
index 73a5d6edb..4fce59e69 100644
--- a/telepathy-glib/base-connection-manager.h
+++ b/telepathy-glib/base-connection-manager.h
@@ -26,7 +26,6 @@
 #ifndef __TP_BASE_CONNECTION_MANAGER_H__
 #define __TP_BASE_CONNECTION_MANAGER_H__
 
-#include <dbus/dbus-glib.h>
 #include <glib-object.h>
 
 #include <telepathy-glib/base-connection.h>
diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index 45fd6d7a3..9f73002c7 100644
--- a/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
@@ -26,7 +26,6 @@
 #ifndef __TP_BASE_CONNECTION_H__
 #define __TP_BASE_CONNECTION_H__
 
-#include <dbus/dbus-glib.h>
 #include <glib-object.h>
 
 #include <telepathy-glib/channel-manager.h>
diff --git a/telepathy-glib/channel-dispatch-operation.c b/telepathy-glib/channel-dispatch-operation.c
index b56feb044..283b34710 100644
--- a/telepathy-glib/channel-dispatch-operation.c
+++ b/telepathy-glib/channel-dispatch-operation.c
@@ -23,6 +23,8 @@
 
 #include "telepathy-glib/channel-dispatch-operation.h"
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/base-client-internal.h>
 #include <telepathy-glib/channel.h>
 #include <telepathy-glib/cli-misc.h>
diff --git a/telepathy-glib/channel-group.c b/telepathy-glib/channel-group.c
index 462976324..f388190af 100644
--- a/telepathy-glib/channel-group.c
+++ b/telepathy-glib/channel-group.c
@@ -22,6 +22,8 @@
 
 #include "telepathy-glib/channel-internal.h"
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/cli-channel.h>
 #include <telepathy-glib/cli-misc.h>
 #include <telepathy-glib/client-factory.h>
diff --git a/telepathy-glib/channel-manager-request-internal.h b/telepathy-glib/channel-manager-request-internal.h
index a23c2c978..e6836fbef 100644
--- a/telepathy-glib/channel-manager-request-internal.h
+++ b/telepathy-glib/channel-manager-request-internal.h
@@ -24,7 +24,6 @@
 
 #include <glib-object.h>
 
-#include <dbus/dbus-glib-lowlevel.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/telepathy-glib/cli-channel.c b/telepathy-glib/cli-channel.c
index 8ecbc5079..b29fed1d0 100644
--- a/telepathy-glib/cli-channel.c
+++ b/telepathy-glib/cli-channel.c
@@ -23,6 +23,8 @@
 
 #include <telepathy-glib/cli-channel.h>
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/proxy-subclass.h>
 #include <telepathy-glib/util.h>
diff --git a/telepathy-glib/cli-connection.c b/telepathy-glib/cli-connection.c
index 51aa4bac4..62ddc8845 100644
--- a/telepathy-glib/cli-connection.c
+++ b/telepathy-glib/cli-connection.c
@@ -23,6 +23,8 @@
 
 #include <telepathy-glib/cli-connection.h>
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/proxy-subclass.h>
 #include <telepathy-glib/util.h>
diff --git a/telepathy-glib/cli-misc.c b/telepathy-glib/cli-misc.c
index 9aa005bf1..42c7f8448 100644
--- a/telepathy-glib/cli-misc.c
+++ b/telepathy-glib/cli-misc.c
@@ -24,6 +24,8 @@
 #include <telepathy-glib/cli-call.h>
 #include <telepathy-glib/cli-misc.h>
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/proxy-subclass.h>
 #include <telepathy-glib/util.h>
diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index cf0b23ef9..957218118 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -25,6 +25,8 @@
 
 #include <string.h>
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/cli-misc.h>
 #include "telepathy-glib/defs.h"
 #include "telepathy-glib/enums.h"
diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
index bf284ae5e..0bc7055e0 100644
--- a/telepathy-glib/dbus.c
+++ b/telepathy-glib/dbus.c
@@ -60,6 +60,7 @@
 #include <string.h>
 
 #include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
 
 #include <gobject/gvaluecollector.h>
 
diff --git a/telepathy-glib/gtypes.c b/telepathy-glib/gtypes.c
index ca5e1b2fb..500be4de8 100644
--- a/telepathy-glib/gtypes.c
+++ b/telepathy-glib/gtypes.c
@@ -22,6 +22,8 @@
 
 #include <telepathy-glib/gtypes.h>
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/util.h>
 
 /**
diff --git a/telepathy-glib/gtypes.h b/telepathy-glib/gtypes.h
index ff6fb21b3..6ea6893fe 100644
--- a/telepathy-glib/gtypes.h
+++ b/telepathy-glib/gtypes.h
@@ -25,7 +25,8 @@
 #ifndef __TP_GTYPES_H__
 #define __TP_GTYPES_H__
 
-#include <dbus/dbus-glib.h>
+#include <glib.h>
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
diff --git a/telepathy-glib/handle-channel-context-internal.h b/telepathy-glib/handle-channel-context-internal.h
index cbd3e66d2..91dfce284 100644
--- a/telepathy-glib/handle-channel-context-internal.h
+++ b/telepathy-glib/handle-channel-context-internal.h
@@ -22,8 +22,6 @@
 #ifndef __TP_HANDLE_CHANNEL_CONTEXT_INTERNAL_H__
 #define __TP_HANDLE_CHANNEL_CONTEXT_INTERNAL_H__
 
-#include <dbus/dbus-glib.h>
-
 #include <telepathy-glib/account.h>
 #include <telepathy-glib/channel.h>
 #include <telepathy-glib/handle-channel-context.h>
diff --git a/telepathy-glib/message.c b/telepathy-glib/message.c
index f64b4122c..01099dbcb 100644
--- a/telepathy-glib/message.c
+++ b/telepathy-glib/message.c
@@ -35,6 +35,8 @@
 #include "message.h"
 #include "message-internal.h"
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/cm-message.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/gtypes.h>
diff --git a/telepathy-glib/observe-channel-context-internal.h b/telepathy-glib/observe-channel-context-internal.h
index bc21bada5..3f5d74855 100644
--- a/telepathy-glib/observe-channel-context-internal.h
+++ b/telepathy-glib/observe-channel-context-internal.h
@@ -22,8 +22,6 @@
 #ifndef __TP_OBSERVE_CHANNEL_CONTEXT_INTERNAL_H__
 #define __TP_OBSERVE_CHANNEL_CONTEXT_INTERNAL_H__
 
-#include <dbus/dbus-glib.h>
-
 #include <telepathy-glib/account.h>
 #include <telepathy-glib/channel-dispatch-operation.h>
 #include <telepathy-glib/observe-channel-context.h>
diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index 0b84d88a1..41e5c90e0 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -37,6 +37,8 @@
 #include <telepathy-glib/protocol.h>
 #include <telepathy-glib/protocol-internal.h>
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/proxy-subclass.h>
diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h
index b0727a6cc..18f003fc3 100644
--- a/telepathy-glib/proxy.h
+++ b/telepathy-glib/proxy.h
@@ -26,7 +26,6 @@
 #ifndef __TP_PROXY_H__
 #define __TP_PROXY_H__
 
-#include <dbus/dbus-glib.h>
 #include <gio/gio.h>
 
 #include <telepathy-glib/defs.h>
diff --git a/telepathy-glib/reentrants.c b/telepathy-glib/reentrants.c
index 6304fd5e6..5ee6c7597 100644
--- a/telepathy-glib/reentrants.c
+++ b/telepathy-glib/reentrants.c
@@ -3,6 +3,8 @@
 #include "telepathy-glib/interfaces.h"
 #include "telepathy-glib/reentrants.h"
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/_gen/tp-cli-account-reentrant-body.h>
 #include <telepathy-glib/_gen/tp-cli-account-manager-reentrant-body.h>
 #include <telepathy-glib/_gen/tp-cli-channel-reentrant-body.h>
diff --git a/telepathy-glib/simple-approver.h b/telepathy-glib/simple-approver.h
index 34181d61b..5630c5713 100644
--- a/telepathy-glib/simple-approver.h
+++ b/telepathy-glib/simple-approver.h
@@ -25,7 +25,6 @@
 #ifndef __TP_SIMPLE_APPROVER_H__
 #define __TP_SIMPLE_APPROVER_H__
 
-#include <dbus/dbus-glib.h>
 #include <glib-object.h>
 
 #include <telepathy-glib/account-manager.h>
diff --git a/telepathy-glib/simple-handler.h b/telepathy-glib/simple-handler.h
index 44cda4824..101ae6f36 100644
--- a/telepathy-glib/simple-handler.h
+++ b/telepathy-glib/simple-handler.h
@@ -25,7 +25,6 @@
 #ifndef __TP_SIMPLE_HANDLER_H__
 #define __TP_SIMPLE_HANDLER_H__
 
-#include <dbus/dbus-glib.h>
 #include <glib-object.h>
 
 #include <telepathy-glib/account-manager.h>
diff --git a/telepathy-glib/simple-observer.h b/telepathy-glib/simple-observer.h
index 8e3ac47cd..9036f139a 100644
--- a/telepathy-glib/simple-observer.h
+++ b/telepathy-glib/simple-observer.h
@@ -25,7 +25,6 @@
 #ifndef __TP_SIMPLE_OBSERVER_H__
 #define __TP_SIMPLE_OBSERVER_H__
 
-#include <dbus/dbus-glib.h>
 #include <glib-object.h>
 
 #include <telepathy-glib/account-manager.h>
diff --git a/telepathy-glib/stream-tube-channel.c b/telepathy-glib/stream-tube-channel.c
index db81322e5..3b0bf6cb2 100644
--- a/telepathy-glib/stream-tube-channel.c
+++ b/telepathy-glib/stream-tube-channel.c
@@ -49,6 +49,8 @@
 
 #include "telepathy-glib/stream-tube-channel.h"
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/cli-channel.h>
 #include <telepathy-glib/contact.h>
 #include <telepathy-glib/dbus.h>
diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
index 57c063083..997d4444a 100644
--- a/telepathy-glib/text-channel.c
+++ b/telepathy-glib/text-channel.c
@@ -47,6 +47,8 @@
 
 #include "telepathy-glib/text-channel.h"
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/cli-channel.h>
 #include <telepathy-glib/cli-misc.h>
 #include <telepathy-glib/contact.h>
diff --git a/telepathy-glib/tls-certificate.c b/telepathy-glib/tls-certificate.c
index 565bb807d..aa055f31b 100644
--- a/telepathy-glib/tls-certificate.c
+++ b/telepathy-glib/tls-certificate.c
@@ -25,6 +25,8 @@
 
 #include <glib/gstdio.h>
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/cli-misc.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/dbus-internal.h>
diff --git a/telepathy-glib/variant-util.c b/telepathy-glib/variant-util.c
index 0541fbea5..baca0fba9 100644
--- a/telepathy-glib/variant-util.c
+++ b/telepathy-glib/variant-util.c
@@ -43,6 +43,8 @@
 #include <telepathy-glib/variant-util.h>
 #include <telepathy-glib/variant-util-internal.h>
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/util.h>
 
diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c
index 53d0e1f22..9b556fa09 100644
--- a/tests/dbus/base-client.c
+++ b/tests/dbus/base-client.c
@@ -9,6 +9,8 @@
 
 #include "config.h"
 
+#include <dbus/dbus-glib.h>
+
 /* We include -internal headers of context to be able to easily access to
  * their semi-private attributes (connection, account, channels, etc). */
 #include <telepathy-glib/add-dispatch-operation-context-internal.h>
diff --git a/tests/dbus/group-mixin.c b/tests/dbus/group-mixin.c
index a625b248d..fa9445da2 100644
--- a/tests/dbus/group-mixin.c
+++ b/tests/dbus/group-mixin.c
@@ -10,6 +10,8 @@
 
 #include "config.h"
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/channel.h>
 #include <telepathy-glib/cli-channel.h>
 #include <telepathy-glib/cli-connection.h>
diff --git a/tests/dbus/message-mixin.c b/tests/dbus/message-mixin.c
index a8c602ab0..35d038008 100644
--- a/tests/dbus/message-mixin.c
+++ b/tests/dbus/message-mixin.c
@@ -10,6 +10,8 @@
 
 #include "config.h"
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/channel.h>
 #include <telepathy-glib/cli-channel.h>
 #include <telepathy-glib/cli-connection.h>