[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=7120c6b

The following commit has been merged in the master branch:
commit 7120c6b2044f4f3359657037fd24d69065e78d9f
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Feb 11 13:06:09 2013 +0100

    Don't explicitly call onContactsChanged() in ContactsListModel
    
    Since 3c0ad6e KTp::GlobalContactManager always emits
    allKnownContactsChanged() signal after it's constructed,
    so there's no need to ask for the contacts manually. Otherwise
    all contacts in the model are doubled, because they are once
    added by the explicit call and once by the signal from
    GlobalContactManager.
---
 KTp/Models/contacts-list-model.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/KTp/Models/contacts-list-model.cpp b/KTp/Models/contacts-list-model.cpp
index dfa3287..692bcfd 100644
--- a/KTp/Models/contacts-list-model.cpp
+++ b/KTp/Models/contacts-list-model.cpp
@@ -74,7 +74,6 @@ KTp::ContactsListModel::~ContactsListModel()
 void KTp::ContactsListModel::setAccountManager(const Tp::AccountManagerPtr &accountManager)
 {
     d->contactManager = new KTp::GlobalContactManager(accountManager, this);
-    onContactsChanged(d->contactManager->allKnownContacts(), Tp::Contacts());
     connect(d->contactManager, SIGNAL(allKnownContactsChanged(Tp::Contacts,Tp::Contacts)), SLOT(onContactsChanged(Tp::Contacts,Tp::Contacts)));
 }
 

-- 
ktp-common-internals packaging