[Pkg-telepathy-commits] [telepathy-glib-1] 34/212: Move dbus-glib header inclusion from headers to source code

Simon McVittie smcv at debian.org
Wed May 14 12:08:48 UTC 2014 

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-glib-1.

commit 9777e093dced3bf5306527c908abe458d8359791
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Mar 17 16:33:58 2014 +0000

    Move dbus-glib header inclusion from headers to source code
    
    Ideally, it should be possible to use telepathy-glib's high-level API
    without being aware of dbus-glib at all.
---
 telepathy-glib/account-channel-request.c                 | 2 ++
 telepathy-glib/account-request.c                         | 2 ++
 telepathy-glib/account.c                                 | 2 ++
 telepathy-glib/add-dispatch-operation-context-internal.h | 2 --
 telepathy-glib/base-client.h                             | 1 -
 telepathy-glib/base-connection-manager.h                 | 1 -
 telepathy-glib/base-connection.h                         | 1 -
 telepathy-glib/channel-dispatch-operation.c              | 2 ++
 telepathy-glib/channel-group.c                           | 2 ++
 telepathy-glib/channel-manager-request-internal.h        | 1 -
 telepathy-glib/cli-channel.c                             | 2 ++
 telepathy-glib/cli-connection.c                          | 2 ++
 telepathy-glib/cli-misc.c                                | 2 ++
 telepathy-glib/connection-manager.c                      | 2 ++
 telepathy-glib/dbus.c                                    | 1 +
 telepathy-glib/gtypes.c                                  | 2 ++
 telepathy-glib/gtypes.h                                  | 3 ++-
 telepathy-glib/handle-channel-context-internal.h         | 2 --
 telepathy-glib/message.c                                 | 2 ++
 telepathy-glib/observe-channel-context-internal.h        | 2 --
 telepathy-glib/protocol.c                                | 2 ++
 telepathy-glib/proxy.h                                   | 1 -
 telepathy-glib/reentrants.c                              | 2 ++
 telepathy-glib/simple-approver.h                         | 1 -
 telepathy-glib/simple-handler.h                          | 1 -
 telepathy-glib/simple-observer.h                         | 1 -
 telepathy-glib/stream-tube-channel.c                     | 2 ++
 telepathy-glib/text-channel.c                            | 2 ++
 telepathy-glib/tls-certificate.c                         | 2 ++
 telepathy-glib/variant-util.c                            | 2 ++
 tests/dbus/base-client.c                                 | 2 ++
 tests/dbus/group-mixin.c                                 | 2 ++
 tests/dbus/message-mixin.c                               | 2 ++
 tests/dbus/simple-approver.c                             | 2 ++
 34 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c
index 39347b6..66c74a4 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 45a59f3..97fd9b4 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 7441533..31393c4 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 c186ad8..5b21a27 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 e3d3da7..f131f8d 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 73a5d6e..4fce59e 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 45fd6d7..9f73002 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 b56feb0..283b347 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 4629763..f388190 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 a23c2c9..e6836fb 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 8ecbc50..b29fed1 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 51aa4ba..62ddc88 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 9aa005b..42c7f84 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 593f847..fa475bc 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 bf284ae..0bc7055 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 ca5e1b2..500be4d 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 ff6fb21..6ea6893 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 cbd3e66..91dfce2 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 f64b412..01099db 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 bc21bad..3f5d748 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 222f528..5714901 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 b0727a6..18f003f 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 6304fd5..5ee6c75 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 34181d6..5630c57 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 44cda48..101ae6f 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 8e3ac47..9036f13 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 db81322..3b0bf6c 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 36243dd..29c84bf 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 6c8aee5..e54f54c 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/client-factory-internal.h>
 #include <telepathy-glib/cli-misc.h>
 #include <telepathy-glib/dbus.h>
diff --git a/telepathy-glib/variant-util.c b/telepathy-glib/variant-util.c
index 2c1a936..8c78298 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 0a93fdb..f13da5a 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 f6c9ba8..952e453 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 6709355..3f80012 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>
diff --git a/tests/dbus/simple-approver.c b/tests/dbus/simple-approver.c
index 9345578..d61e9df 100644
--- a/tests/dbus/simple-approver.c
+++ b/tests/dbus/simple-approver.c
@@ -9,6 +9,8 @@
 
 #include "config.h"
 
+#include <dbus/dbus-glib.h>
+
 #include <telepathy-glib/simple-approver.h>
 #include <telepathy-glib/cli-misc.h>
 #include <telepathy-glib/client.h>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib-1.git

More information about the Pkg-telepathy-commits mailing list