[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:04:28 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=fbadca3
The following commit has been merged in the master branch:
commit fbadca33f660bbf73fb8617fccbff998cd85efbb
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.
---
models/accounts-model-item.cpp | 4 +++-
models/accounts-model-item.h | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/models/accounts-model-item.cpp b/models/accounts-model-item.cpp
index 7334b06..c80d519 100644
--- a/models/accounts-model-item.cpp
+++ b/models/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/models/accounts-model-item.h b/models/accounts-model-item.h
index edcc30e..451e72a 100644
--- a/models/accounts-model-item.h
+++ b/models/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
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list