From 7405b4da3e8c50b23d686cb5f0970e0fba1cf375 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 7 May 2012 18:24:12 +0100
Subject: [PATCH] Use meta-headers and catch up with current 'next' branch

---
 src/connection-aliasing.c     |    6 ++----
 src/connection-capabilities.c |    7 ++-----
 src/connection.c              |   10 +++-------
 src/im-channel-factory.c      |    8 ++------
 src/im-channel.c              |    7 ++-----
 src/im-channel.h              |    2 +-
 src/protocol.c                |    1 +
 src/protocol.h                |    2 +-
 8 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/connection-aliasing.c b/src/connection-aliasing.c
index 2c75d65..6d1017c 100644
--- a/src/connection-aliasing.c
+++ b/src/connection-aliasing.c
@@ -20,10 +20,8 @@
  */
 #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 <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "connection.h"
 #include "debug.h"
diff --git a/src/connection-capabilities.c b/src/connection-capabilities.c
index b8d1b99..0d5195f 100644
--- a/src/connection-capabilities.c
+++ b/src/connection-capabilities.c
@@ -24,11 +24,8 @@
 
 #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 <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "connection.h"
 #include "debug.h"
diff --git a/src/connection.c b/src/connection.c
index 826c6b0..e1b7761 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -23,12 +23,8 @@
 
 #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 <telepathy-glib/telepathy-glib-dbus.h>
 
 #include <libpurple/accountopt.h>
 #include <libpurple/version.h>
@@ -543,7 +539,7 @@ _contact_normalize (TpHandleRepoIface *repo,
 
 static void
 _haze_connection_create_handle_repos (TpBaseConnection *base,
-        TpHandleRepoIface *repos[NUM_TP_HANDLE_TYPES])
+        TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPES])
 {
     repos[TP_HANDLE_TYPE_CONTACT] =
         tp_dynamic_handle_repo_new (TP_HANDLE_TYPE_CONTACT, _contact_normalize,
diff --git a/src/im-channel-factory.c b/src/im-channel-factory.c
index fee7990..b4d0901 100644
--- a/src/im-channel-factory.c
+++ b/src/im-channel-factory.c
@@ -24,12 +24,8 @@
 
 #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 <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "debug.h"
 #include "im-channel.h"
diff --git a/src/im-channel.c b/src/im-channel.c
index 036437d..11a174d 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -19,11 +19,8 @@
  *
  */
 
-#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 <telepathy-glib/telepathy-glib-dbus.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/protocol.c b/src/protocol.c
index eaf105a..cc01911 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -29,6 +29,7 @@
 #include <libpurple/accountopt.h>
 #include <libpurple/prpl.h>
 #include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "connection.h"
 #include "debug.h"
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>
 
-- 
1.7.10