From 26e58808539660ea63f5da29d72b6792900d2de2 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 12 Sep 2013 15:28:19 +0200
Subject: [PATCH 2/3] use tp-glib single includes

https://bugs.freedesktop.org/show_bug.cgi?id=69272
---
 configure.ac                  | 1 +
 extensions/Makefile.am        | 2 +-
 src/connection-aliasing.c     | 5 +----
 src/connection-avatars.c      | 4 +---
 src/connection-avatars.h      | 2 +-
 src/connection-capabilities.c | 6 +-----
 src/connection-mail.c         | 4 +---
 src/connection-manager.c      | 2 +-
 src/connection-manager.h      | 2 +-
 src/connection-presence.c     | 2 +-
 src/connection.c              | 7 +------
 src/connection.h              | 5 +----
 src/contact-list.c            | 5 +----
 src/contact-list.h            | 2 +-
 src/debug.c                   | 3 +--
 src/im-channel-factory.c      | 7 +------
 src/im-channel.c              | 6 +-----
 src/im-channel.h              | 2 +-
 src/main.c                    | 2 +-
 src/media-backend.c           | 5 ++---
 src/media-channel.c           | 8 +-------
 src/media-channel.h           | 3 +--
 src/media-manager.c           | 5 +----
 src/media-stream.c            | 7 ++-----
 src/protocol.h                | 2 +-
 tools/glib-ginterface-gen.py  | 2 +-
 26 files changed, 28 insertions(+), 73 deletions(-)

diff --git a/configure.ac b/configure.ac
index bb7cbfb..7e42519 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,7 @@ PKG_CHECK_MODULES(PURPLE,[purple >= 2.7])
 PKG_CHECK_MODULES(GLIB,[glib-2.0 >= 2.22, gobject-2.0, gio-2.0])
 PKG_CHECK_MODULES(DBUS_GLIB,[dbus-glib-1 >= 0.73])
 
+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(TP_GLIB,[telepathy-glib >= 0.21])
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index c10f042..32c9640 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -52,7 +52,7 @@ _gen/svc.c _gen/svc.h: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py \
 	Makefile.am
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
 		--filename=_gen/svc --signal-marshal-prefix=_haze_ext \
-		--include='<telepathy-glib/dbus.h>' \
+		--include='<telepathy-glib/telepathy-glib.h>' \
 		--include='"_gen/signals-marshal.h"' \
 		--allow-unstable \
 		--not-implemented-func='tp_dbus_g_method_return_not_implemented' \
diff --git a/src/connection-aliasing.c b/src/connection-aliasing.c
index 8400e59..f9b51c2 100644
--- a/src/connection-aliasing.c
+++ b/src/connection-aliasing.c
@@ -20,10 +20,7 @@
  */
 #include "connection-aliasing.h"
 
-#include <telepathy-glib/contacts-mixin.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/handle.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "connection.h"
 #include "debug.h"
diff --git a/src/connection-avatars.c b/src/connection-avatars.c
index 1042938..42fd24d 100644
--- a/src/connection-avatars.c
+++ b/src/connection-avatars.c
@@ -23,9 +23,7 @@
 
 #include <string.h>
 
-#include <telepathy-glib/contacts-mixin.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libpurple/cipher.h>
 
diff --git a/src/connection-avatars.h b/src/connection-avatars.h
index 8517cc3..e7ce3ce 100644
--- a/src/connection-avatars.h
+++ b/src/connection-avatars.h
@@ -23,7 +23,7 @@
 
 
 #include <glib-object.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 void haze_connection_avatars_iface_init (gpointer g_iface, gpointer iface_data);
 void haze_connection_avatars_class_init (GObjectClass *object_class);
diff --git a/src/connection-capabilities.c b/src/connection-capabilities.c
index 04cecfc..ab59f05 100644
--- a/src/connection-capabilities.c
+++ b/src/connection-capabilities.c
@@ -24,11 +24,7 @@
 
 #include "connection-capabilities.h"
 
-#include <telepathy-glib/contacts-mixin.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/handle.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "connection.h"
 #include "debug.h"
diff --git a/src/connection-mail.c b/src/connection-mail.c
index 9b71c9d..0e663ca 100644
--- a/src/connection-mail.c
+++ b/src/connection-mail.c
@@ -21,9 +21,7 @@
 
 #include "extensions/extensions.h"
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "connection.h"
 #include "connection-mail.h"
diff --git a/src/connection-manager.c b/src/connection-manager.c
index 6377b9e..3002e5d 100644
--- a/src/connection-manager.c
+++ b/src/connection-manager.c
@@ -27,7 +27,7 @@
 #include <libpurple/prpl.h>
 #include <libpurple/accountopt.h>
 
-#include <telepathy-glib/debug-sender.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "connection-manager.h"
 #include "debug.h"
diff --git a/src/connection-manager.h b/src/connection-manager.h
index b90f37f..4d24ff8 100644
--- a/src/connection-manager.h
+++ b/src/connection-manager.h
@@ -22,7 +22,7 @@
  */
 
 #include <glib-object.h>
-#include <telepathy-glib/base-connection-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "protocol.h"
 #include "connection.h"
diff --git a/src/connection-presence.c b/src/connection-presence.c
index 74ba730..1455a65 100644
--- a/src/connection-presence.c
+++ b/src/connection-presence.c
@@ -22,7 +22,7 @@
 #include "connection-presence.h"
 #include "debug.h"
 
-#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 static const TpPresenceStatusOptionalArgumentSpec arg_specs[] = {
     { "message", "s" },
diff --git a/src/connection.c b/src/connection.c
index 5518214..e74ad5d 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -23,12 +23,7 @@
 
 #include <string.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/dbus-properties-mixin.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/handle-repo-dynamic.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libpurple/accountopt.h>
 #include <libpurple/version.h>
diff --git a/src/connection.h b/src/connection.h
index 7fc8668..cf463a1 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -22,10 +22,7 @@
  */
 
 #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/simple-password-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libpurple/account.h>
 #include <libpurple/prpl.h>
diff --git a/src/contact-list.c b/src/contact-list.c
index 13bf348..9a2fba9 100644
--- a/src/contact-list.c
+++ b/src/contact-list.c
@@ -21,10 +21,7 @@
 
 #include <string.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/intset.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "connection.h"
 #include "contact-list.h"
diff --git a/src/contact-list.h b/src/contact-list.h
index 59b75c2..e8bcb77 100644
--- a/src/contact-list.h
+++ b/src/contact-list.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-contact-list.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/debug.c b/src/debug.c
index 976332b..e11f56c 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -24,8 +24,7 @@
 #include <stdarg.h>
 
 #include <libpurple/debug.h>
-#include <telepathy-glib/debug.h>
-#include <telepathy-glib/debug-sender.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 
 typedef enum
diff --git a/src/im-channel-factory.c b/src/im-channel-factory.c
index 3fb9824..21fade5 100644
--- a/src/im-channel-factory.c
+++ b/src/im-channel-factory.c
@@ -24,12 +24,7 @@
 
 #include <string.h>
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/handle-repo.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "debug.h"
 #include "im-channel.h"
diff --git a/src/im-channel.c b/src/im-channel.c
index d374491..bd74baa 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -19,11 +19,7 @@
  *
  */
 
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/exportable-channel.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "im-channel.h"
 #include "connection.h"
diff --git a/src/im-channel.h b/src/im-channel.h
index 59105c7..6427828 100644
--- a/src/im-channel.h
+++ b/src/im-channel.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/message-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libpurple/conversation.h>
 
diff --git a/src/main.c b/src/main.c
index 0c48ac5..3f9b38f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -47,7 +47,7 @@
 #include <libpurple/dbus-server.h>
 #endif
 
-#include <telepathy-glib/run.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "defines.h"
 #include "debug.h"
diff --git a/src/media-backend.c b/src/media-backend.c
index ec40af9..99f0545 100644
--- a/src/media-backend.c
+++ b/src/media-backend.c
@@ -22,9 +22,8 @@
 #include "media-backend.h"
 
 #include <libpurple/media/backend-iface.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/svc-media-interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include <string.h>
 
diff --git a/src/media-channel.c b/src/media-channel.c
index 54c2a41..370936b 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -25,13 +25,7 @@
 
 #include <libpurple/media/backend-iface.h>
 #include <libpurple/mediamanager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/svc-channel.h>
-#include <telepathy-glib/svc-properties-interface.h>
-#include <telepathy-glib/svc-media-interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "connection.h"
 #include "debug.h"
diff --git a/src/media-channel.h b/src/media-channel.h
index 60081d1..ce76440 100644
--- a/src/media-channel.h
+++ b/src/media-channel.h
@@ -25,8 +25,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/dbus-properties-mixin.h>
-#include <telepathy-glib/group-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/media-manager.c b/src/media-manager.c
index 3df771c..544abc4 100644
--- a/src/media-manager.c
+++ b/src/media-manager.c
@@ -23,10 +23,7 @@
 #include "media-manager.h"
 
 #include <libpurple/mediamanager.h>
-#include <telepathy-glib/channel-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/gtypes.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "connection.h"
 #include "debug.h"
diff --git a/src/media-stream.c b/src/media-stream.c
index 7b4f29f..969d5ac 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -25,11 +25,8 @@
 
 #include <libpurple/media/backend-iface.h>
 #include <string.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/errors.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/properties-mixin.h>
-#include <telepathy-glib/svc-media-interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #define DEBUG_FLAG HAZE_DEBUG_MEDIA
 
diff --git a/src/protocol.h b/src/protocol.h
index dd1792d..27c3460 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -23,7 +23,7 @@
 #ifndef __HAZE_PROTOCOL_H__
 #define __HAZE_PROTOCOL_H__
 
-#include <telepathy-glib/base-protocol.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libpurple/prpl.h>
 
diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py
index 13f7f69..6543146 100644
--- a/tools/glib-ginterface-gen.py
+++ b/tools/glib-ginterface-gen.py
@@ -701,7 +701,7 @@ class Generator(object):
         self.h('#include <dbus/dbus-glib.h>')
 
         if self.have_properties(nodes):
-            self.h('#include <telepathy-glib/dbus-properties-mixin.h>')
+            self.h('#include <telepathy-glib/telepathy-glib.h>')
 
         self.h('')
         self.h('G_BEGIN_DECLS')
-- 
1.8.3.1