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

The following commit has been merged in the master branch:
commit d5d2d6666c57065227bd33bc13861564d85d2257
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Fri Dec 16 11:18:38 2011 +0100

    Restore the behavior to show offline contacts while searching.
    
    This is now toggled in contact-list rather than in common-internals.
    
    REVIEW: 103410
---
 main-widget.cpp | 8 +++++++-
 main-widget.h   | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 1abf528..686d629 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -357,7 +357,7 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
             m_modelFilter, SLOT(setShowOfflineUsers(bool)));
 
     connect(m_filterBar, SIGNAL(filterChanged(QString)),
-            m_modelFilter, SLOT(setFilterString(QString)));
+            this, SLOT(onFilterStringChanged(QString)));
 
     connect(m_filterBar, SIGNAL(closeRequest()),
             m_filterBar, SLOT(hide()));
@@ -933,6 +933,12 @@ KMenu* MainWidget::groupContextMenu(const QModelIndex &index)
     return menu;
 }
 
+void MainWidget::onFilterStringChanged(const QString &str)
+{
+    m_modelFilter->setShowOfflineUsers(!str.isEmpty());
+    m_modelFilter->setFilterString(str);
+}
+
 void MainWidget::onAddContactToGroupTriggered()
 {
     QModelIndex index = m_contactsListView->currentIndex();
diff --git a/main-widget.h b/main-widget.h
index 037e4f4..b700a59 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -112,6 +112,7 @@ private Q_SLOTS:
     void onContactListDoubleClicked(const QModelIndex &index);
     void onAccountConnectionStatusChanged(Tp::ConnectionStatus status);
     void onCustomContextMenuRequested(const QPoint &point);
+    void onFilterStringChanged(const QString &str);
 
     void onSwitchToFullView();
     void onSwitchToCompactView();

-- 
ktp-contact-list packaging