[telepathy-qt4/master] Fixed bug 21993: TextChannel does not become ready until first message is received if FeatureMessageQueue is enabled

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/text-channel.cpp |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/TelepathyQt4/text-channel.cpp b/TelepathyQt4/text-channel.cpp
index 2c17eba..c8da57a 100644
--- a/TelepathyQt4/text-channel.cpp
+++ b/TelepathyQt4/text-channel.cpp
@@ -292,8 +292,13 @@ void TextChannel::Private::updateInitialMessages()
 
     MessagePartListList messages = qdbus_cast<MessagePartListList>(
             props["PendingMessages"]);
-    foreach (const MessagePartList &message, messages) {
-        parent->onMessageReceived(message);
+    if (messages.isEmpty()) {
+        debug() << "Message queue empty: FeatureMessageQueue is now ready";
+        readinessHelper->setIntrospectCompleted(FeatureMessageQueue, true);
+    } else {
+        foreach (const MessagePartList &message, messages) {
+            parent->onMessageReceived(message);
+        }
     }
 }
 
-- 
1.5.6.5