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

The following commit has been merged in the master branch:
commit ec4b69682ca377ecb812e7b874508e1da135351e
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Dec 19 16:09:47 2011 +0100

    Use only global presence chooser.
    
    If you want the buttons for debug, set your config file to "selected_presence_chooser=iknowwhatimdoinggimmebackmyshinybuttons".
---
 main-widget.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 4125f22..1a91516 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -190,11 +190,11 @@ MainWidget::MainWidget(QWidget *parent)
 //
 //     presenceChooserGroup->actions().last()->setCheckable(true);
 //
-//     if (guiConfigGroup.readEntry("selected_presence_chooser", "global") == QLatin1String("global")) {
+    if (guiConfigGroup.readEntry("selected_presence_chooser", "global") == QLatin1String("global")) {
 //         presenceChooserGroup->actions().last()->setChecked(true);
 //         //hide account buttons and show global presence
-//         onUseGlobalPresenceTriggered();
-//     }
+         onUseGlobalPresenceTriggered();
+    }
 //
 //     presenceChooserGroup->addAction(presenceChooser->addAction(i18n("Separately"),
 //                                                                     this, SLOT(onUsePerAccountPresenceTriggered())));

-- 
ktp-contact-list packaging