telepathy-qt: BaseConnection::ensureChannel(): Fixed requirements for the request argument.

[David Edmundson]

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

Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Thu Mar 26 23:18:54 2015 +0500

BaseConnection::ensureChannel(): Fixed requirements for the request argument.

ensureChannel() have the same request argument semantic as createChannel(),
so only ChannelType key must be present.

---

 TelepathyQt/base-connection.cpp |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/TelepathyQt/base-connection.cpp b/TelepathyQt/base-connection.cpp
index 27af154..2194df4 100644
--- a/TelepathyQt/base-connection.cpp
+++ b/TelepathyQt/base-connection.cpp
@@ -760,10 +760,7 @@ void BaseConnectionRequestsInterface::channelClosed(const QDBusObjectPath &remov
 void BaseConnectionRequestsInterface::ensureChannel(const QVariantMap &request, bool &yours,
         QDBusObjectPath &objectPath, QVariantMap &details, DBusError *error)
 {
-    if (!request.contains(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"))
-            || !request.contains(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"))
-            || (!request.contains(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"))
-                && !request.contains(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID")))) {
+    if (!request.contains(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"))) {
         error->set(TP_QT_ERROR_INVALID_ARGUMENT, QLatin1String("Missing parameters"));
         return;
     }