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

The following commit has been merged in the master branch:
commit ad75d44da148f7c2cdd6412e44823a8981f017b2
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Mar 29 01:47:07 2013 +0000

    Re-fix crash in debug versions of Qt in contacts model
    
    REVIEW: 109788
    BUG: 300600
---
 KTp/Models/contacts-model.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/KTp/Models/contacts-model.cpp b/KTp/Models/contacts-model.cpp
index c2d4a42..c1405d8 100644
--- a/KTp/Models/contacts-model.cpp
+++ b/KTp/Models/contacts-model.cpp
@@ -111,6 +111,11 @@ bool KTp::ContactsModel::trackUnreadMessages() const
 
 void KTp::ContactsModel::updateGroupProxyModels()
 {
+    //reset the filter
+    //trying to track current selections whilst updating proxy models can cause issues
+    //debug versions of Qt will assert
+    reset();
+
     //if there no account manager there's not a lot point doing anything
     if (!d->accountManager) {
         return;
@@ -142,11 +147,6 @@ void KTp::ContactsModel::updateGroupProxyModels()
 
     switch (d->groupMode) {
     case NoGrouping:
-        //This is a workaround to a Qt assert which gets confused when we switch from a source model that was
-        //part of the proxy chain, and is now used in the view directly
-        //
-        //do not disable until you have tested on Qt in debug mode
-        setSourceModel(0);
         setSourceModel(modelToGroup);
         break;
     case AccountGrouping:

-- 
ktp-common-internals packaging