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

The following commit has been merged in the master branch:
commit ccefd11472bd55f6d3cc2c68d1b3e5ab17c986cf
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Oct 31 12:41:41 2011 +0100

    Disable per accounts setting from contact list.
    
    Reasons:
     * presence applet does not currently support it
     * kded module currently does not support it
     * if one or more accounts are set offline and at least one is still online, the others will be brought back online with every single presence change, that includes for example auto-away kicking in, every track change and/or mpris-player play/pause signal
     * users get confused (while they should disable their accounts in the first place)
    
    We should think more about this after the 0.2 release, either make all components aware of sinlge account presences and make them all support it (is it worth it?) or simply discard this possibility completely.
---
 main-widget.cpp | 56 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 3e04b98..ab37eb0 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -176,34 +176,34 @@ MainWidget::MainWidget(QWidget *parent)
 
     settingsButtonMenu->addMenu(setDelegateTypeMenu);
 
-    KMenu *presenceChooser = new KMenu(settingsButton);
-    presenceChooser->setTitle(i18n("Control accounts presence"));
-
-    QActionGroup *presenceChooserGroup = new QActionGroup(this);
-    presenceChooserGroup->setExclusive(true);
-    presenceChooserGroup->addAction(presenceChooser->addAction(i18n("All at once"),
-                                                               this, SLOT(onUseGlobalPresenceTriggered())));
-
-    presenceChooserGroup->actions().last()->setCheckable(true);
-
-    if (guiConfigGroup.readEntry("selected_presence_chooser", "global") == QLatin1String("global")) {
-        presenceChooserGroup->actions().last()->setChecked(true);
-        //hide account buttons and show global presence
-        onUseGlobalPresenceTriggered();
-    }
-
-    presenceChooserGroup->addAction(presenceChooser->addAction(i18n("Separately"),
-                                                                    this, SLOT(onUsePerAccountPresenceTriggered())));
-
-    presenceChooserGroup->actions().last()->setCheckable(true);
-
-    if (guiConfigGroup.readEntry("selected_presence_chooser", "global") == QLatin1String("per-account")) {
-        presenceChooserGroup->actions().last()->setChecked(true);
-        //hide global presence and use account buttons
-        onUsePerAccountPresenceTriggered();
-    }
-
-    settingsButtonMenu->addMenu(presenceChooser);
+//     KMenu *presenceChooser = new KMenu(settingsButton);
+//     presenceChooser->setTitle(i18n("Control accounts presence"));
+//
+//     QActionGroup *presenceChooserGroup = new QActionGroup(this);
+//     presenceChooserGroup->setExclusive(true);
+//     presenceChooserGroup->addAction(presenceChooser->addAction(i18n("All at once"),
+//                                                                this, SLOT(onUseGlobalPresenceTriggered())));
+//
+//     presenceChooserGroup->actions().last()->setCheckable(true);
+//
+//     if (guiConfigGroup.readEntry("selected_presence_chooser", "global") == QLatin1String("global")) {
+//         presenceChooserGroup->actions().last()->setChecked(true);
+//         //hide account buttons and show global presence
+//         onUseGlobalPresenceTriggered();
+//     }
+//
+//     presenceChooserGroup->addAction(presenceChooser->addAction(i18n("Separately"),
+//                                                                     this, SLOT(onUsePerAccountPresenceTriggered())));
+//
+//     presenceChooserGroup->actions().last()->setCheckable(true);
+//
+//     if (guiConfigGroup.readEntry("selected_presence_chooser", "global") == QLatin1String("per-account")) {
+//         presenceChooserGroup->actions().last()->setChecked(true);
+//         //hide global presence and use account buttons
+//         onUsePerAccountPresenceTriggered();
+//     }
+//
+//     settingsButtonMenu->addMenu(presenceChooser);
 
     settingsButtonMenu->addAction(i18n("Join chat room"), this, SLOT(onJoinChatRoomRequested()));
     settingsButtonMenu->addSeparator();

-- 
ktp-contact-list packaging