[Telepathy-commits] [telepathy-qt4/master] cm-basics: Work around fd.o#20165 by ensuring there is a ref to the TpDBusDaemon

[Simon McVittie]

---
 configure.ac             |    2 +-
 tests/dbus/cm-basics.cpp |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index bce95d5..c64d20a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,7 +182,7 @@ AC_SUBST(PROTO_CFLAGS)
 
 dnl Check for telepathy-glib, and for Qt <-> GLib main loop integration:
 dnl if we have both, we can run more tests
-PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.7.23], [have_tp_glib=yes],
+PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.7.26], [have_tp_glib=yes],
                   [have_tp_glib=no])
 AC_SUBST(TP_GLIB_CFLAGS)
 AC_SUBST(TP_GLIB_LIBS)
diff --git a/tests/dbus/cm-basics.cpp b/tests/dbus/cm-basics.cpp
index 0a636ae..cd8bf4e 100644
--- a/tests/dbus/cm-basics.cpp
+++ b/tests/dbus/cm-basics.cpp
@@ -10,6 +10,7 @@
 #include <TelepathyQt4/Client/PendingStringList>
 #include <TelepathyQt4/Debug>
 
+#include <telepathy-glib/dbus.h>
 #include <telepathy-glib/debug.h>
 
 #include <tests/lib/simple-manager.h>
@@ -53,7 +54,12 @@ void TestCmBasics::initTestCase()
         SIMPLE_TYPE_CONNECTION_MANAGER,
         NULL));
     QVERIFY(mCMService != 0);
+
+    // This TpDBusDaemon is a workaround for fd.o#20165 (revert when we start
+    // to depend on a telepathy-glib without this bug)
+    TpDBusDaemon *dbus_daemon = tp_dbus_daemon_dup(0);
     QVERIFY(tp_base_connection_manager_register(mCMService));
+    g_object_unref(dbus_daemon);
 }
 
 void TestCmBasics::init()
-- 
1.5.6.5