telepathy-qt: dbus-tubes: If the handle type is not Room, simply finish the feature.

Dario Freddi drf at kemper.freedesktop.org
Tue Jul 3 15:08:41 PDT 2012


Module: telepathy-qt
Branch: master
Commit: d8bfda6eac4ed61c741fb33773733867efd0f7f7
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=d8bfda6eac4ed61c741fb33773733867efd0f7f7

Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date:   Thu Jun 16 14:00:22 2011 +0200

dbus-tubes: If the handle type is not Room, simply finish the feature.

---

 TelepathyQt/dbus-tube-channel.cpp |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/TelepathyQt/dbus-tube-channel.cpp b/TelepathyQt/dbus-tube-channel.cpp
index 5b99d3f..cceabbc 100644
--- a/TelepathyQt/dbus-tube-channel.cpp
+++ b/TelepathyQt/dbus-tube-channel.cpp
@@ -124,13 +124,14 @@ void DBusTubeChannel::Private::introspectBusNamesMonitoring(DBusTubeChannel::Pri
     if (parent->targetHandleType() == static_cast<uint>(Tp::HandleTypeRoom)) {
         parent->connect(dbusTubeInterface, SIGNAL(DBusNamesChanged(Tp::DBusTubeParticipants,Tp::UIntList)),
                         parent, SLOT(onDBusNamesChanged(Tp::DBusTubeParticipants,Tp::UIntList)));
+
+        // Request the current DBusNames property
+        connect(dbusTubeInterface->requestPropertyDBusNames(), SIGNAL(finished(Tp::PendingOperation*)),
+                parent, SLOT(onRequestPropertyDBusNamesFinished(Tp::PendingOperation*)));
     } else {
         debug() << "FeatureBusNameMonitoring does not make sense in a P2P context";
+        self->readinessHelper->setIntrospectCompleted(DBusTubeChannel::FeatureBusNameMonitoring, false);
     }
-
-    // Request the current DBusNames property
-    connect(dbusTubeInterface->requestPropertyDBusNames(), SIGNAL(finished(Tp::PendingOperation*)),
-            parent, SLOT(onRequestPropertyDBusNamesFinished(Tp::PendingOperation*)));
 }
 
 void DBusTubeChannel::Private::introspectDBusTube(DBusTubeChannel::Private *self)



More information about the telepathy-commits mailing list