From 7fe6cfdde358a717e3c8dc163961404174f52599 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 16 Sep 2013 16:16:45 +0200
Subject: [PATCH 2/3] use TP_DISABLE_SINGLE_INCLUDE

---
 configure.ac                 | 1 +
 extensions/Makefile.am       | 2 +-
 extensions/extensions.h      | 2 +-
 rakia/base-connection.h      | 3 +--
 rakia/call-channel.c         | 4 ----
 rakia/call-channel.h         | 2 +-
 rakia/call-content.h         | 2 +-
 rakia/call-stream.h          | 2 +-
 rakia/codec-param-formats.h  | 2 +-
 rakia/connection-aliasing.c  | 6 +-----
 rakia/debug.c                | 3 +--
 rakia/handles.h              | 2 +-
 rakia/media-manager.c        | 4 +---
 rakia/text-channel.c         | 8 +-------
 rakia/text-channel.h         | 4 +---
 rakia/text-manager.c         | 4 +---
 src/protocol.h               | 2 +-
 src/sip-connection-helpers.c | 6 +-----
 src/sip-connection-manager.c | 4 ----
 src/sip-connection-manager.h | 2 +-
 src/sip-connection-private.h | 2 +-
 src/sip-connection.c         | 8 --------
 src/sip-connection.h         | 2 +-
 src/telepathy-rakia.c        | 3 +--
 tools/glib-ginterface-gen.py | 2 +-
 25 files changed, 22 insertions(+), 60 deletions(-)

diff --git a/configure.ac b/configure.ac
index f9be359..e572e3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,7 @@ AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_30], [Prevent post 2.30 AP
 PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60, dbus-glib-1 >= 0.60])
 PKG_CHECK_MODULES([SOFIA_SIP_UA], [sofia-sip-ua-glib >= 1.12.11])
 
+AC_DEFINE(TP_DISABLE_SINGLE_INCLUDE, [], [Disable single header include])
 AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_0_22], [Ignore post 0.22 deprecations])
 AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_0_22], [Prevent post 0.22 APIs])
 PKG_CHECK_MODULES([TELEPATHY_GLIB], [telepathy-glib >= 0.21.1])
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index f99d103..0915693 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -116,7 +116,7 @@ _gen/svc-channel.c: _gen/channel.xml $(tools_dir)/glib-ginterface-gen.py
 	$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
 		--filename=_gen/svc-channel \
 		--signal-marshal-prefix=_rakia_ext \
-		--include='<telepathy-glib/dbus.h>' \
+		--include='<telepathy-glib/telepathy-glib.h>' \
 		--include='"_gen/signals-marshal.h"' \
 		--not-implemented-func='tp_dbus_g_method_return_not_implemented' \
 		--allow-unstable \
diff --git a/extensions/extensions.h b/extensions/extensions.h
index 0318277..2b8b16f 100644
--- a/extensions/extensions.h
+++ b/extensions/extensions.h
@@ -2,7 +2,7 @@
 #define __SIP_EXTENSIONS_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <extensions/_gen/enums.h>
 #include <extensions/_gen/svc-channel.h>
diff --git a/rakia/base-connection.h b/rakia/base-connection.h
index 2d2d526..1bd505d 100644
--- a/rakia/base-connection.h
+++ b/rakia/base-connection.h
@@ -23,8 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/contacts-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <rakia/sofia-decls.h>
 #include <rakia/event-target.h>
diff --git a/rakia/call-channel.c b/rakia/call-channel.c
index 51267f2..63280b4 100644
--- a/rakia/call-channel.c
+++ b/rakia/call-channel.c
@@ -30,10 +30,6 @@
 #define DEBUG_FLAG RAKIA_DEBUG_CALL
 #include "rakia/debug.h"
 
-
-#include <telepathy-glib/exportable-channel.h>
-
-
 G_DEFINE_TYPE (RakiaCallChannel, rakia_call_channel,
     TP_TYPE_BASE_MEDIA_CALL_CHANNEL)
 
diff --git a/rakia/call-channel.h b/rakia/call-channel.h
index 06c2eaf..4bb07a8 100644
--- a/rakia/call-channel.h
+++ b/rakia/call-channel.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-media-call-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/rakia/call-content.h b/rakia/call-content.h
index 65dd415..ccfe0e1 100644
--- a/rakia/call-content.h
+++ b/rakia/call-content.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-media-call-content.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "rakia/call-channel.h"
 #include "rakia/sip-session.h"
diff --git a/rakia/call-stream.h b/rakia/call-stream.h
index ccc15ab..8bdbb69 100644
--- a/rakia/call-stream.h
+++ b/rakia/call-stream.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-media-call-stream.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "rakia/call-content.h"
 #include "rakia/sip-media.h"
diff --git a/rakia/codec-param-formats.h b/rakia/codec-param-formats.h
index 668ee4f..add8f5e 100644
--- a/rakia/codec-param-formats.h
+++ b/rakia/codec-param-formats.h
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <rakia/sip-media.h>
 
diff --git a/rakia/connection-aliasing.c b/rakia/connection-aliasing.c
index aec89fa..e585601 100644
--- a/rakia/connection-aliasing.c
+++ b/rakia/connection-aliasing.c
@@ -25,11 +25,7 @@
 #include <rakia/base-connection.h>
 #include <rakia/handles.h>
 
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-connection.h>
-#include <telepathy-glib/contacts-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "rakia/handles.h"
 
diff --git a/rakia/debug.c b/rakia/debug.c
index b33563e..1709d6e 100644
--- a/rakia/debug.c
+++ b/rakia/debug.c
@@ -23,8 +23,7 @@
 
 #include <glib.h>
 
-#include <telepathy-glib/debug.h>
-#include <telepathy-glib/debug-sender.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "config.h"
 
diff --git a/rakia/handles.h b/rakia/handles.h
index da71e2b..02d429f 100644
--- a/rakia/handles.h
+++ b/rakia/handles.h
@@ -21,7 +21,7 @@
 #ifndef RAKIA_HANDLE_H
 #define RAKIA_HANDLE_H
 
-#include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <sofia-sip/sip.h>
 
 G_BEGIN_DECLS
diff --git a/rakia/media-manager.c b/rakia/media-manager.c
index 7b996e0..2db7580 100644
--- a/rakia/media-manager.c
+++ b/rakia/media-manager.c
@@ -24,9 +24,7 @@
 
 #include <string.h>
 
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "rakia/base-connection.h"
 #include "rakia/call-channel.h"
diff --git a/rakia/text-channel.c b/rakia/text-channel.c
index ca18970..130b095 100644
--- a/rakia/text-channel.c
+++ b/rakia/text-channel.c
@@ -32,13 +32,7 @@
 #include <time.h>
 
 #include <dbus/dbus-glib.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "rakia/event-target.h"
 #include "rakia/base-connection.h"
diff --git a/rakia/text-channel.h b/rakia/text-channel.h
index 4de8fa0..398f752 100644
--- a/rakia/text-channel.h
+++ b/rakia/text-channel.h
@@ -22,9 +22,7 @@
 #define __RAKIA_TEXT_CHANNEL_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
-#include <telepathy-glib/handle.h>
-#include <telepathy-glib/message-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <rakia/sofia-decls.h>
 
diff --git a/rakia/text-manager.c b/rakia/text-manager.c
index 12d88f5..290b56c 100644
--- a/rakia/text-manager.c
+++ b/rakia/text-manager.c
@@ -24,9 +24,7 @@
 
 #include <string.h>
 
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "rakia/text-channel.h"
 #include "rakia/base-connection.h"
diff --git a/src/protocol.h b/src/protocol.h
index a7e9b25..ccf8c27 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -21,7 +21,7 @@
 #define RAKIA_PROTOCOL_H
 
 #include <glib-object.h>
-#include <telepathy-glib/base-protocol.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <rakia/sofia-decls.h>
 #include <sofia-sip/su_glib.h>
diff --git a/src/sip-connection-helpers.c b/src/sip-connection-helpers.c
index 74524f7..794bbf9 100644
--- a/src/sip-connection-helpers.c
+++ b/src/sip-connection-helpers.c
@@ -24,11 +24,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <rakia/util.h>
 #include <rakia/handles.h>
diff --git a/src/sip-connection-manager.c b/src/sip-connection-manager.c
index 697417f..b0924a2 100644
--- a/src/sip-connection-manager.c
+++ b/src/sip-connection-manager.c
@@ -31,10 +31,6 @@
 
 #include <dbus/dbus-protocol.h>
 
-#include <telepathy-glib/debug-sender.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/svc-connection-manager.h>
-
 #include <rakia/sofia-decls.h>
 #include <sofia-sip/su_glib.h>
 #include <sofia-sip/su_log.h>
diff --git a/src/sip-connection-manager.h b/src/sip-connection-manager.h
index ed89900..cce2ec7 100644
--- a/src/sip-connection-manager.h
+++ b/src/sip-connection-manager.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-connection-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/sip-connection-private.h b/src/sip-connection-private.h
index 9a572aa..9427525 100644
--- a/src/sip-connection-private.h
+++ b/src/sip-connection-private.h
@@ -27,7 +27,7 @@
 #include <rakia/sofia-decls.h>
 #include <sofia-sip/sresolv.h>
 
-#include <telepathy-glib/simple-password-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #ifdef HAVE_LIBIPHB
 #include <iphbd/libiphb.h>
diff --git a/src/sip-connection.c b/src/sip-connection.c
index 91b0e8e..f0ea3ed 100644
--- a/src/sip-connection.c
+++ b/src/sip-connection.c
@@ -29,14 +29,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/handle-repo-dynamic.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-connection.h>
-#include <telepathy-glib/svc-generic.h>
-
 #include <rakia/event-target.h>
 #include <rakia/handles.h>
 #include <rakia/connection-aliasing.h>
diff --git a/src/sip-connection.h b/src/sip-connection.h
index 8f26bd5..1ebab77 100644
--- a/src/sip-connection.h
+++ b/src/sip-connection.h
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 
 #include <rakia/base-connection.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/telepathy-rakia.c b/src/telepathy-rakia.c
index 305fd43..efc4234 100644
--- a/src/telepathy-rakia.c
+++ b/src/telepathy-rakia.c
@@ -32,8 +32,7 @@
 
 #include <dbus/dbus.h>
 
-#include <telepathy-glib/run.h>
-#include <telepathy-glib/debug.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 static TpBaseConnectionManager *
 construct_cm (void)
diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py
index 0c7c419..a8180b7 100644
--- a/tools/glib-ginterface-gen.py
+++ b/tools/glib-ginterface-gen.py
@@ -608,7 +608,7 @@ class Generator(object):
     def __call__(self):
         self.h('#include <glib-object.h>')
         self.h('#include <dbus/dbus-glib.h>')
-        self.h('#include <telepathy-glib/dbus-properties-mixin.h>')
+        self.h('#include <telepathy-glib/telepathy-glib.h>')
         self.h('')
         self.h('G_BEGIN_DECLS')
         self.h('')
-- 
1.8.3.1