[telepathy-qt4/master] ClientRegistrar: Use ChannelDispatchOperation high-level class on AbstractClientObserver.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Mon Jun 1 22:36:03 PDT 2009


---
 TelepathyQt4/abstract-client.h    |    2 +-
 TelepathyQt4/client-registrar.cpp |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/TelepathyQt4/abstract-client.h b/TelepathyQt4/abstract-client.h
index f9e5f72..90a1f47 100644
--- a/TelepathyQt4/abstract-client.h
+++ b/TelepathyQt4/abstract-client.h
@@ -59,7 +59,7 @@ public:
             const AccountPtr &account,
             const ConnectionPtr &connection,
             const QList<ChannelPtr> &channels,
-            const QString &dispatchOperationPath,
+            const ChannelDispatchOperationPtr &dispatchOperation,
             const QList<ChannelRequestPtr> &requestsSatisfied,
             const QVariantMap &observerInfo) = 0;
 
diff --git a/TelepathyQt4/client-registrar.cpp b/TelepathyQt4/client-registrar.cpp
index e1f5977..20112c2 100644
--- a/TelepathyQt4/client-registrar.cpp
+++ b/TelepathyQt4/client-registrar.cpp
@@ -131,6 +131,10 @@ void ClientObserverAdaptor::ObserveChannels(const QDBusObjectPath &accountPath,
         channels.append(channel);
     }
 
+    ChannelDispatchOperationPtr channelDispatchOperation =
+        ChannelDispatchOperation::create(mBus,
+                dispatchOperationPath.path(), QVariantMap());
+
     QList<ChannelRequestPtr> channelRequests;
     ChannelRequestPtr channelRequest;
     foreach (const QDBusObjectPath &path, requestsSatisfied) {
@@ -144,7 +148,7 @@ void ClientObserverAdaptor::ObserveChannels(const QDBusObjectPath &accountPath,
                 new MethodInvocationContext<>(mBus, message));
 
     mClient->observeChannels(context, account, connection, channels,
-            dispatchOperationPath.path(), channelRequests, observerInfo);
+            channelDispatchOperation, channelRequests, observerInfo);
 }
 
 QHash<QPair<QString, QString>, QList<ClientHandlerAdaptor *> > ClientHandlerAdaptor::mAdaptorsForConnection;
-- 
1.5.6.5




More information about the telepathy-commits mailing list