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

The following commit has been merged in the master branch:
commit 7cdaba0754ae1872af09b74d7cee1043ed94f2cf
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Feb 26 18:07:43 2015 +0100

    Only notify about removed pins if they were actually present
---
 KTp/Declarative/pinned-contacts-model.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/KTp/Declarative/pinned-contacts-model.cpp b/KTp/Declarative/pinned-contacts-model.cpp
index c91b93d..e2bef5a 100644
--- a/KTp/Declarative/pinned-contacts-model.cpp
+++ b/KTp/Declarative/pinned-contacts-model.cpp
@@ -186,10 +186,14 @@ int PinnedContactsModel::rowCount(const QModelIndex &parent) const
 void PinnedContactsModel::removeContactPin(const KTp::PersistentContactPtr &pin)
 {
     int row = d->m_pins.indexOf(pin);
-    beginRemoveRows(QModelIndex(), row, row);
-    d->m_pins.removeAt(row);
-    endRemoveRows();
+    if (row>=0) {
+        beginRemoveRows(QModelIndex(), row, row);
+        d->m_pins.removeAt(row);
+        endRemoveRows();
+
         Q_EMIT stateChanged();
+    } else
+        qWarning() << "trying to remove missing pin" << pin->contactId();
 }
 
 void PinnedContactsModel::appendContactPin(const KTp::PersistentContactPtr &pin)

-- 
ktp-common-internals packaging