[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=79a08e6

The following commit has been merged in the master branch:
commit 79a08e6e0f9088479d9337b9d4317fd2c11a4d9c
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Feb 23 16:02:26 2012 +0100

    Correctly handle "show offline" after clearing filter string
---
 contact-list-widget.cpp | 3 ++-
 contact-list-widget_p.h | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 7bbe0c4..372bcf8 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -339,6 +339,7 @@ void ContactListWidget::toggleOfflineContacts(bool show)
 {
     Q_D(ContactListWidget);
 
+    d->showOffline = show;
     d->modelFilter->setPresenceTypeFilterFlags(show ? AccountsFilterModel::DoNotFilterByPresence : AccountsFilterModel::ShowOnlyConnected);
 }
 
@@ -532,7 +533,7 @@ void ContactListWidget::setFilterString(const QString& string)
 {
     Q_D(ContactListWidget);
 
-    d->modelFilter->setPresenceTypeFilterFlags(string.isEmpty() ? AccountsFilterModel::ShowOnlyConnected : AccountsFilterModel::DoNotFilterByPresence);
+    d->modelFilter->setPresenceTypeFilterFlags(string.isEmpty() && !d->showOffline ? AccountsFilterModel::ShowOnlyConnected : AccountsFilterModel::DoNotFilterByPresence);
     d->modelFilter->setDisplayNameFilterString(string);
 }
 
diff --git a/contact-list-widget_p.h b/contact-list-widget_p.h
index a6a3a3d..750eaf0 100644
--- a/contact-list-widget_p.h
+++ b/contact-list-widget_p.h
@@ -36,7 +36,8 @@ public:
       modelFilter(0),
       delegate(0),
       compactDelegate(0),
-      shouldDrag(false) {}
+      shouldDrag(false),
+      showOffline(false) {}
 
     AccountsModel          *model;
     GroupsModel            *groupsModel;
@@ -46,6 +47,7 @@ public:
     QRect                   dropIndicatorRect;
     QPoint                  dragStartPosition;
     bool                    shouldDrag;
+    bool                    showOffline;
 };
 
 #endif //CONTACT_LIST_WIDGET_P_H

-- 
ktp-contact-list packaging