[Telepathy-commits] [telepathy-qt4/master] Connection: Only ChannelType is mandatory on ensure/createChannel.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Tue Jan 27 06:34:06 PST 2009


---
 TelepathyQt4/Client/connection.cpp |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/TelepathyQt4/Client/connection.cpp b/TelepathyQt4/Client/connection.cpp
index 88e7bff..6a1ba3a 100644
--- a/TelepathyQt4/Client/connection.cpp
+++ b/TelepathyQt4/Client/connection.cpp
@@ -1091,8 +1091,7 @@ PendingChannel *Connection::createChannel(const QVariantMap &request)
                 "Connection does not support Requests Interface");
     }
 
-    if (!request.contains(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType")) ||
-        !request.contains(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"))) {
+    if (!request.contains(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"))) {
         return new PendingChannel(this, TELEPATHY_ERROR_INVALID_ARGUMENT,
                 "Invalid 'request' argument");
     }
@@ -1143,8 +1142,7 @@ PendingChannel *Connection::ensureChannel(const QVariantMap &request)
                 "Connection does not support Requests Interface");
     }
 
-    if (!request.contains(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType")) ||
-        !request.contains(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"))) {
+    if (!request.contains(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"))) {
         return new PendingChannel(this, TELEPATHY_ERROR_INVALID_ARGUMENT,
                 "Invalid 'request' argument");
     }
-- 
1.5.6.5




More information about the Telepathy-commits mailing list