[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=979f8ae

The following commit has been merged in the master branch:
commit 979f8ae101cd6b77b99bdee8d747904cf2874200
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Sep 16 13:17:32 2011 +0100

    Possible fix for sorting issues in filter model
    
    Reviewed-by: David Edmundson
    CCBUG: 281393
---
 main-widget.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index ca13d12..868085c 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -302,17 +302,17 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     m_model = new AccountsModel(m_accountManager, this);
     m_groupsModel = new GroupsModel(m_model, this);
     m_modelFilter = new AccountsFilterModel(this);
-    if (m_groupContactsAction->isChecked()) {
-        m_modelFilter->setSourceModel(m_groupsModel);
-    } else {
-        m_modelFilter->setSourceModel(m_model);
-    }
     m_modelFilter->setDynamicSortFilter(true);
     m_modelFilter->setShowOfflineUsers(m_showOfflineAction->isChecked());
     m_modelFilter->clearFilterString();
     m_modelFilter->setFilterCaseSensitivity(Qt::CaseInsensitive);
     m_modelFilter->setSortRole(Qt::DisplayRole);
     m_modelFilter->setSortByPresence(m_sortByPresenceAction->isChecked());
+    if (m_groupContactsAction->isChecked()) {
+        m_modelFilter->setSourceModel(m_groupsModel);
+    } else {
+        m_modelFilter->setSourceModel(m_model);
+    }
     m_contactsListView->setModel(m_modelFilter);
     m_contactsListView->setSortingEnabled(true);
     m_contactsListView->sortByColumn(0, Qt::AscendingOrder);

-- 
ktp-contact-list packaging