[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:05:50 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=cb6f275
The following commit has been merged in the master branch:
commit cb6f2759b28f2c16b748f94c45f71a5294872c47
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Thu Apr 7 18:58:47 2011 +0100
Reduced code duplication, and made sure ContactManager state is checked on load
Reviewed by: Martin Klapetek
---
accounts-model-item.cpp | 12 ++++++------
accounts-model-item.h | 1 +
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/accounts-model-item.cpp b/accounts-model-item.cpp
index 1d207e7..c96921f 100644
--- a/accounts-model-item.cpp
+++ b/accounts-model-item.cpp
@@ -58,12 +58,7 @@ AccountsModelItem::AccountsModelItem(const Tp::AccountPtr &account)
: mPriv(new Private(account))
{
if (!mPriv->mAccount->connection().isNull()) {
- Tp::ContactManagerPtr manager = account->connection()->contactManager();
- connect(manager.data(),
- SIGNAL(allKnownContactsChanged(Tp::Contacts,Tp::Contacts,
- Tp::Channel::GroupMemberChangeDetails)),
- SLOT(onContactsChanged(Tp::Contacts,Tp::Contacts)));
- QTimer::singleShot(0, this, SLOT(addKnownContacts()));
+ QTimer::singleShot(0, this, SLOT(onNewConnection()));
}
connect(mPriv->mAccount.data(),
@@ -287,6 +282,11 @@ void AccountsModelItem::onStatusChanged(Tp::ConnectionStatus status)
emit connectionStatusChanged(mPriv->mAccount->uniqueIdentifier(), status);
}
+void AccountsModelItem::onNewConnection()
+{
+ onConnectionChanged(mPriv->mAccount->connection());
+}
+
void AccountsModelItem::onConnectionChanged(const Tp::ConnectionPtr &connection)
{
onChanged();
diff --git a/accounts-model-item.h b/accounts-model-item.h
index 7abf409..1f99064 100644
--- a/accounts-model-item.h
+++ b/accounts-model-item.h
@@ -64,6 +64,7 @@ private Q_SLOTS:
void onStatusChanged(Tp::ConnectionStatus status);
+ void onNewConnection();
void onConnectionChanged(const Tp::ConnectionPtr &connection);
void onContactManagerStateChanged(Tp::ContactListState state);
void onContactsChanged(const Tp::Contacts &added,
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list