[Telepathy-commits] [telepathy-haze/master] Require a new telepathy-glib and don't check for tp_debug_divert_messages

[Simon McVittie]

---
 configure.ac |    7 +------
 src/debug.c  |    4 ----
 2 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 713ab86..93e3fb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,15 +70,10 @@ PKG_CHECK_MODULES(PURPLE,[purple >= 2.1.1])
 AC_SUBST(PURPLE_CFLAGS)
 AC_SUBST(PURPLE_LIBS)
 
-PKG_CHECK_MODULES(TP_GLIB,[telepathy-glib >= 0.7.14])
+PKG_CHECK_MODULES(TP_GLIB,[telepathy-glib >= 0.7.17])
 AC_SUBST(TP_GLIB_CFLAGS)
 AC_SUBST(TP_GLIB_LIBS)
 
-AC_CHECK_LIB(telepathy-glib, tp_debug_divert_messages,
-  [ AC_DEFINE(HAVE_TP_DEBUG_DIVERT_MESSAGES, [],
-    [Define if tp_debug_divert_messages() is provided by telepathy-glib]) ],
-  [], [$TP_GLIB_LIBS])
-
 AC_CHECK_LIB(purple, purple_dbus_uninit,
   [ AC_DEFINE(HAVE_PURPLE_DBUS_UNINIT, [],
     [Define if purple_dbus_uninit is present in libpurple]) ],
diff --git a/src/debug.c b/src/debug.c
index 000dd56..3771a0a 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -58,10 +58,6 @@ haze_debug_set_flags_from_env ()
 
     if (g_getenv ("HAZE_PERSIST"))
         tp_debug_set_persistent (TRUE);
-
-#ifdef HAVE_TP_DEBUG_DIVERT_MESSAGES
-    tp_debug_divert_messages (g_getenv ("HAZE_LOGFILE"));
-#endif
 }
 
 
-- 
1.5.6.5