[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=c6fa895

The following commit has been merged in the master branch:
commit c6fa8950b3eb7f640f417c8867e19952a6ce6b63
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Feb 27 17:09:46 2011 +0000

    Contacts appear on load, if already connected
    Warning: This modifies files copied from Tp-Qt4-Yell. Also pushing this
    patch upstream.
---
 accounts-model-item.cpp | 4 +++-
 accounts-model-item.h   | 4 ++--
 main-widget.cpp         | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/accounts-model-item.cpp b/accounts-model-item.cpp
index 7334b06..c80d519 100644
--- a/accounts-model-item.cpp
+++ b/accounts-model-item.cpp
@@ -63,6 +63,7 @@ AccountsModelItem::AccountsModelItem(const Tp::AccountPtr &account)
                 SIGNAL(allKnownContactsChanged(Tp::Contacts,Tp::Contacts,
                                                Tp::Channel::GroupMemberChangeDetails)),
                 SLOT(onContactsChanged(Tp::Contacts,Tp::Contacts)));
+        QTimer::singleShot(0, this, SLOT(addKnownContacts()));
     }
 
     connect(mPriv->mAccount.data(),
@@ -345,6 +346,7 @@ void AccountsModelItem::addKnownContacts()
         // get the list of contact ids in the children
         QStringList idList;
         int numElems = size();
+
         for (int i = 0; i < numElems; ++i) {
             ContactModelItem *item = qobject_cast<ContactModelItem *>(childAt(i));
             if (item) {
@@ -363,4 +365,4 @@ void AccountsModelItem::addKnownContacts()
     if (newNodes.count() > 0) {
         emit childrenAdded(this, newNodes);
     }
-}
\ No newline at end of file
+}
diff --git a/accounts-model-item.h b/accounts-model-item.h
index edcc30e..451e72a 100644
--- a/accounts-model-item.h
+++ b/accounts-model-item.h
@@ -50,12 +50,12 @@ public:
     Q_INVOKABLE void setRequestedPresence(int type, const QString &status, const QString &statusMessage);
 
     void clearContacts();
-    void addKnownContacts();
 
 Q_SIGNALS:
     void connectionStatusChanged(const QString &accountId, int status);
 
 private Q_SLOTS:
+    void addKnownContacts();
     void onRemoved();
 
     void onChanged();
@@ -72,4 +72,4 @@ private:
     Private *mPriv;
 };
 
-#endif // TELEPATHY_ACCOUNTS_MODEL_ITEM_H
\ No newline at end of file
+#endif // TELEPATHY_ACCOUNTS_MODEL_ITEM_H
diff --git a/main-widget.cpp b/main-widget.cpp
index 4138b93..1871c8d 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -386,7 +386,8 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
             m_accountButtonsLayout->addWidget(bt);         
         }
     }
-    
+    m_contactsListView->expandAll();
+
     m_accountButtonsLayout->insertStretch(-1);
     
 //     QPushButton *bInfo = new QPushButton(this);
@@ -445,7 +446,7 @@ void MainWidget::onAccountConnectionStatusChanged(Tp::ConnectionStatus status)
 void MainWidget::onConnectionChanged(const Tp::ConnectionPtr& connection)
 {
     Q_UNUSED(connection);
-    m_contactsListView->expandAll();
+//    m_contactsListView->expandAll();
     //Tp::AccountPtr account(qobject_cast<Tp::Account*>(sender()));
     kDebug();
 }

-- 
ktp-contact-list packaging