[Telepathy-commits] [telepathy-qt4/master] Warn when using PendingContacts::handles() and identifiers() inconsistently in respect to the query

[Olli Salli]

---
 TelepathyQt4/Client/pending-contacts.cpp |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/TelepathyQt4/Client/pending-contacts.cpp b/TelepathyQt4/Client/pending-contacts.cpp
index e242873..d92e40a 100644
--- a/TelepathyQt4/Client/pending-contacts.cpp
+++ b/TelepathyQt4/Client/pending-contacts.cpp
@@ -79,11 +79,6 @@ ContactManager *PendingContacts::contactManager() const
     return mPriv->connection->contactManager();
 }
 
-UIntList PendingContacts::handles() const
-{
-    return mPriv->handles;
-}
-
 QSet<Contact::Feature> PendingContacts::features() const
 {
     return mPriv->features;
@@ -94,6 +89,15 @@ bool PendingContacts::isForHandles() const
     return !isForIdentifiers();
 }
 
+UIntList PendingContacts::handles() const
+{
+    if (!isForHandles()) {
+        warning() << "Tried to get handles from" << this << "which is for identifiers!";
+    }
+
+    return mPriv->handles;
+}
+
 bool PendingContacts::isForIdentifiers() const
 {
     return mPriv->isForIdentifiers;
@@ -102,7 +106,7 @@ bool PendingContacts::isForIdentifiers() const
 QStringList PendingContacts::identifiers() const
 {
     if (!isForIdentifiers()) {
-
+        warning() << "Tried to get identifiers from" << this << "which is for handles!";
     }
 
     return mPriv->identifiers;
-- 
1.5.6.5