telepathy-gabble: Disable tp-glib single include

[Xavier Claessens]

Module: telepathy-gabble
Branch: master
Commit: 5fd48d98fe83c974d6e024cf4fcb8735a0016460
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=5fd48d98fe83c974d6e024cf4fcb8735a0016460

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Mon Sep 10 17:48:51 2012 +0200

Disable tp-glib single include

---

 configure.ac       |    3 ++-
 src/connection.h   |    3 ---
 src/message-util.h |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7a5832e..c04aa7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -295,9 +295,10 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.1.0, dbus-glib-1 >= 0.82])
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
+AC_DEFINE(TP_DISABLE_SINGLE_INCLUDE, [], [Disable single header include])
 AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_18, [Ignore post 0.18 deprecations])
 AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_20, [Prevent post 0.20 APIs])
-PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.19.7])
+PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.19.9])
 
 AC_SUBST(TP_GLIB_CFLAGS)
 AC_SUBST(TP_GLIB_LIBS)
diff --git a/src/connection.h b/src/connection.h
index f648ef4..c3e9138 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -39,9 +39,6 @@
 #include "muc-factory.h"
 #include "types.h"
 
-#include <telepathy-glib/base-connection.h>
-#include <telepathy-glib/base-contact-list.h>
-
 #include <gabble/capabilities-set.h>
 #include <gabble/types.h>
 #include <gabble/plugin-connection.h>
diff --git a/src/message-util.h b/src/message-util.h
index 80853c8..404d431 100644
--- a/src/message-util.h
+++ b/src/message-util.h
@@ -21,7 +21,7 @@
 #ifndef __GABBLE_MESSAGE_UTIL_H__
 #define __GABBLE_MESSAGE_UTIL_H__
 
-#include <telepathy-glib/message-mixin.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <wocky/wocky.h>
 #include <wocky/wocky.h>