[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=8d1a46f

The following commit has been merged in the master branch:
commit 8d1a46f542b4d9d8dcfa4e36cb41c7fb3c16bf6d
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
---
 models/accounts-model-item.cpp | 12 ++++++------
 models/accounts-model-item.h   |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/models/accounts-model-item.cpp b/models/accounts-model-item.cpp
index 1d207e7..c96921f 100644
--- a/models/accounts-model-item.cpp
+++ b/models/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/models/accounts-model-item.h b/models/accounts-model-item.h
index 7abf409..1f99064 100644
--- a/models/accounts-model-item.h
+++ b/models/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-common-internals packaging