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

The following commit has been merged in the master branch:
commit b9c114a834bd5b240d013b48caf3b1f5ed6e8446
Merge: e4d9180acb6af155d2cec3e2bf5053cf5871750f e65e7fc099d647d62fd7eb36f8ae905839b2a935
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Apr 25 11:23:25 2014 +0200

    Merge branch 'kde-telepathy-0.8'
    
    Conflicts:
    	ktp-contactlist.desktop

 CMakeLists.txt                                     |  5 ++-
 contact-list-widget.cpp                            | 38 ++++--------------
 contact-list-widget_p.h                            |  1 -
 empty-row-filter.cpp                               | 45 ++++++++++++++++++++++
 contact-list-application.cpp => empty-row-filter.h | 37 +++++++++---------
 global-presence-chooser.cpp                        | 20 +++++++---
 6 files changed, 89 insertions(+), 57 deletions(-)

diff --cc contact-list-widget.cpp
index 74ad75b,936c3d1..2235714
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@@ -102,18 -79,12 +81,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());
-     setSortingEnabled(true);
-     sortByColumn(0, Qt::AscendingOrder);
      loadGroupStatesFromConfig();
  
-     connect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)),
-             this, SLOT(onNewGroupModelItemsInserted(QModelIndex,int,int)));
- 
      header()->hide();
      setSortingEnabled(true);
      setEditTriggers(NoEditTriggers);

-- 
ktp-contact-list packaging