[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=0690f5c

The following commit has been merged in the master branch:
commit 0690f5c9a70b4730604222ccaf922e1f206730cc
Author: Eike Hein <hein at kde.org>
Date:   Wed Jul 20 13:25:16 2011 +0200

    Fix preferences load code.
    
    There was a logic error in there causing stored boolean preferences
    to only be applied when they were set to true, thus e.g. disabling
    groups wouldn't survive accross restarts.
    
    CCBUG:277216
---
 main-widget.cpp | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index b6b7cf8..8f6534b 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -372,20 +372,17 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     KSharedConfigPtr config = KGlobal::config();
     KConfigGroup guiConfigGroup(config, "GUI");
 
-    if (guiConfigGroup.readEntry("use_groups", true)) {
-        onGroupContacts(true);
-        m_groupContactsAction->setChecked(true);
-    }
+    bool useGroups = guiConfigGroup.readEntry("use_groups", true);
+    onGroupContacts(useGroups);
+    m_groupContactsAction->setChecked(useGroups);
 
-    if (guiConfigGroup.readEntry("show_offline", false)) {
-        m_modelFilter->showOfflineUsers(true);
-        m_showOfflineAction->setChecked(true);
-    }
+    bool showOffline = guiConfigGroup.readEntry("show_offline", false);
+    m_modelFilter->showOfflineUsers(showOffline);
+    m_showOfflineAction->setChecked(showOffline);
 
-    if (guiConfigGroup.readEntry("sort_by_presence", true)) {
-        m_modelFilter->setSortByPresence(true);
-        m_sortByPresenceAction->setChecked(true);
-    }
+    bool sortByPresence = guiConfigGroup.readEntry("sort_by_presence", true);
+    m_modelFilter->setSortByPresence(sortByPresence);
+    m_sortByPresenceAction->setChecked(sortByPresence);
 }
 
 void MainWidget::onAccountConnectionStatusChanged(Tp::ConnectionStatus status)
@@ -1467,7 +1464,7 @@ void MainWidget::closeEvent(QCloseEvent* e)
                     KGuiItem(i18n("Go Offline"), KIcon("user-offline")),
                     KStandardGuiItem::cancel(),
                     QString("dont_check_for_plasmoid"))) {
-                
+
                 case KMessageBox::No:
                     generalConfigGroup.writeEntry("go_offline_when_closing", true);
                     goOffline();

-- 
ktp-contact-list packaging