[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=49948a6

The following commit has been merged in the master branch:
commit 49948a63dadfb9a0b5dec4de173c0b74c874cad1
Author: David Edmundson <davidedmundson at kde.org>
Date:   Mon Jun 23 00:14:25 2014 +0200

    Clear filter bar rather than hide on starting action
    
    BUG: 335453
    REVIEW: 118890
    FIXED-IN: 0.9.0
---
 main-widget.cpp | 7 ++++---
 main-widget.h   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index a07b534..cf1b97d 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -71,6 +71,7 @@
 #include "contact-list-application.h"
 #include "tooltips/tooltipmanager.h"
 #include "context-menu.h"
+#include "filter-bar.h"
 
 bool kde_tp_filter_contacts_by_publication_status(const Tp::ContactPtr &contact)
 {
@@ -138,7 +139,7 @@ MainWidget::MainWidget(QWidget *parent)
             this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 
     connect(m_contactsListView, SIGNAL(actionStarted()),
-            this, SLOT(hideSearchWidget()));
+            this, SLOT(clearSearch()));
 
     connect(m_contactsListView, SIGNAL(contactSelectionChanged()),
             this, SLOT(onContactSelectionChanged()));
@@ -406,9 +407,9 @@ void MainWidget::toggleSearchWidget(bool show)
     }
 }
 
-void MainWidget::hideSearchWidget()
+void MainWidget::clearSearch()
 {
-    toggleSearchWidget(false);
+    m_filterBar->clear();
 }
 
 void MainWidget::setupGlobalMenu()
diff --git a/main-widget.h b/main-widget.h
index 11efbeb..38c963e 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -81,7 +81,7 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void toggleSearchWidget(bool show);
-    void hideSearchWidget();
+    void clearSearch();
     void onAccountManagerReady(Tp::PendingOperation* op);
     void onAddContactRequest();
     void onStartChatRequest();

-- 
ktp-contact-list packaging