[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=295bbef

The following commit has been merged in the master branch:
commit 295bbefc7edf6dfbb9e7a6a43bc62ea202b8052d
Merge: c6f4fded287f75340be89a59040bc70751112298 22f3a272f553f0dcce7989c5b0e45e80e9a322c5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Apr 25 17:57:02 2014 +0200

    Merge branch 'origin-kde-telepathy-0.8'

 CMakeLists.txt          |  2 +-
 contact-list-widget.cpp | 24 ++++++++++++++++++++++++
 contact-list-widget_p.h |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --cc contact-list-widget.cpp
index 4e688e9,ae1b9c9..10061b7
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@@ -81,9 -101,12 +103,11 @@@ ContactListWidget::ContactListWidget(QW
      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());
  
+     setStyle(d->style.data());
      loadGroupStatesFromConfig();
  
      header()->hide();

-- 
ktp-contact-list packaging