[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=f9f0622

The following commit has been merged in the master branch:
commit f9f0622b104bd7b1ce907be7b05983f67362f9ca
Author: Daniele Elmo Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Aug 5 09:56:40 2010 +0000

    Wait for contacts to be ready after upgradeContacts
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1159406
---
 lib/chatconnection.cpp | 17 ++++++++++++-----
 lib/chatconnection.h   |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/chatconnection.cpp b/lib/chatconnection.cpp
index 94c4ee4..2d10155 100644
--- a/lib/chatconnection.cpp
+++ b/lib/chatconnection.cpp
@@ -19,6 +19,7 @@
 
 #include "chatconnection.h"
 #include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/PendingContacts>
 #include <TelepathyQt4/ContactManager>
 
 ChatConnection::ChatConnection(QObject *parent, const AccountPtr account, const ConnectionPtr connection,  QList<ChannelPtr> channels)
@@ -51,13 +52,19 @@ ChatConnection::ChatConnection(QObject *parent, const AccountPtr account, const
 
 void ChatConnection::onChannelReady(Tp::PendingOperation*)
 {
-    m_connection->contactManager()->upgradeContacts(QList<ContactPtr>::fromSet(m_channel->groupContacts()), QSet<Contact::Feature>() <<
-                                                    Contact::FeatureAlias <<
-                                                    Contact::FeatureAvatarToken << Contact::FeatureCapabilities << Contact::FeatureSimplePresence
-                                                    );
-
+    PendingContacts* p = m_connection->contactManager()->upgradeContacts(QList<ContactPtr>::fromSet(m_channel->groupContacts()),
+                                                                         QSet<Contact::Feature>() << Contact::FeatureAlias
+                                                                                                  << Contact::FeatureAvatarToken
+                                                                                                  << Contact::FeatureCapabilities
+                                                                                                  << Contact::FeatureSimplePresence
+                                                                        );
+    connect(p, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onPendingContactsReady(Tp::PendingOperation*)));
     qDebug() << "channel ready";
+}
 
+void ChatConnection::onPendingContactsReady(Tp::PendingOperation*)
+{
+    qDebug() << "contacts ready";
     //m_isChannelReady = true;
     emit(channelReadyStateChanged(true));
 }
diff --git a/lib/chatconnection.h b/lib/chatconnection.h
index f0d3370..ffdf46d 100644
--- a/lib/chatconnection.h
+++ b/lib/chatconnection.h
@@ -61,7 +61,7 @@ private:
 
 private slots:
     void onChannelReady(Tp::PendingOperation*);
-
+    void onPendingContactsReady(Tp::PendingOperation*);
 };
 
 #endif // CHATCONNECTION_H

-- 
ktp-text-ui packaging