[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=7e4aaf5

The following commit has been merged in the master branch:
commit 7e4aaf55d4834381dc1e272e953302d7c78c5942
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Apr 11 17:22:29 2014 +0200

    Delay setting trackUnreadMessages only after we have the model init'd
    
    Reviewed-by: David Edmundson
    
    BUG: 320570
---
 contact-list-widget.cpp | 1 -
 main-widget.cpp         | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index ff91593..74ad75b 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -102,7 +102,6 @@ ContactListWidget::ContactListWidget(QWidget *parent)
     d->compactDelegate = new ContactDelegateCompact(ContactDelegateCompact::Normal, this);
 
     d->model = new KTp::ContactsModel(this);
-    d->model->setTrackUnreadMessages(true);
     d->model->setDynamicSortFilter(true);
     d->model->setSortRole(Qt::DisplayRole);
     d->style.reset(new NoLinesStyle());
diff --git a/main-widget.cpp b/main-widget.cpp
index 3e3950d..c6ef9ff 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -767,6 +767,8 @@ void MainWidget::onModelInitialized(bool success)
         m_messageWidget->setIcon(KIcon::fromTheme(QLatin1String("dialog-warning")));
         m_messageWidget->animatedShow();
     }
+
+    m_contactsListView->contactsModel()->setTrackUnreadMessages(true);
 }
 
 

-- 
ktp-contact-list packaging