[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=8247895

The following commit has been merged in the master branch:
commit 82478954742f29369f8bef3708921970d42b50ec
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Jun 10 20:49:51 2014 +0200

    Check for selected contact in existing model entries
    
    This fixes a bug when using kpeople if the selected contact
    is loaded from the kpeople cache in the model constructor
    
    BUG: 333921
    FIXED-IN: 0.8.3
    REVIEW: 118647
---
 logviewer/entity-view.cpp | 12 ++++++++++++
 logviewer/entity-view.h   |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/logviewer/entity-view.cpp b/logviewer/entity-view.cpp
index 70e7755..f052bc8 100644
--- a/logviewer/entity-view.cpp
+++ b/logviewer/entity-view.cpp
@@ -24,6 +24,8 @@
 #include <KTp/Logger/log-entity.h>
 #include <KTp/types.h>
 
+#include <QAbstractItemModel>
+
 #include <TelepathyQt/Account>
 
 #include "person-entity-merge-model.h"
@@ -34,6 +36,16 @@ EntityView::EntityView(QWidget *parent) :
     setHeaderHidden(true);
 }
 
+void EntityView::setModel(QAbstractItemModel *model)
+{
+    QTreeView::setModel(model);
+
+    //check if any existing items contain the selected contact
+    if (model->rowCount() > 0) {
+        rowsInserted(QModelIndex(), 0, model->rowCount() -1);
+    }
+}
+
 void EntityView::rowsInserted(const QModelIndex &parent, int start, int end)
 {
     QTreeView::rowsInserted(parent, start, end);
diff --git a/logviewer/entity-view.h b/logviewer/entity-view.h
index 48b132d..5505052 100644
--- a/logviewer/entity-view.h
+++ b/logviewer/entity-view.h
@@ -31,6 +31,8 @@ class EntityView : public QTreeView
 public:
     explicit EntityView(QWidget *parent = 0);
 
+    void setModel(QAbstractItemModel *model);
+
 Q_SIGNALS:
     void noSuchContact();
 

-- 
ktp-text-ui packaging