[Telepathy-commits] [telepathy-qt4/master] Connection: Remove the check for handle == 0 on requesting channel handles and added a FIXME.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/Client/connection.cpp |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/TelepathyQt4/Client/connection.cpp b/TelepathyQt4/Client/connection.cpp
index ff39a7e..03990c2 100644
--- a/TelepathyQt4/Client/connection.cpp
+++ b/TelepathyQt4/Client/connection.cpp
@@ -949,20 +949,22 @@ void Connection::gotContactListsHandles(PendingOperation *op)
     request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
                    Telepathy::HandleTypeList);
 
+    // FIXME check for handles in pending->invalidHandles() when
+    //       invalidHandles is implemented
+    // for handle in invalidHandles {
+    //     debug() << "Unable to request handle for contact list" <<
+    //         ContactManager::ContactListChannel::identifierForType(
+    //                 (ContactManager::ContactListChannel::Type) i);
+    //     // let's not fail, because the contact lists are not supported
+    //     contactListChannelReady();
+    //     continue;
+    // }
+
     ReferencedHandles handles = pending->handles();
     uint handle;
     for (int i = 0; i < ContactManager::ContactListChannel::LastType; ++i) {
         handle = handles[i];
 
-        if (handle == 0) {
-            debug() << "Unable to request handle for contact list" <<
-                ContactManager::ContactListChannel::identifierForType(
-                        (ContactManager::ContactListChannel::Type) i);
-            // let's not fail, because the contact lists are not supported
-            contactListChannelReady();
-            continue;
-        }
-
         mPriv->contactListsChannels[i].handle = handle;
         request[QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle")] = handle;
 
-- 
1.5.6.5