[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=a268638

The following commit has been merged in the master branch:
commit a2686389ab6cd68f10df5e4d5a09be6c0026a235
Author: Peter Amidon <peter at picnicpark.org>
Date:   Fri Nov 30 19:09:08 2012 +0100

    Fixed the auto-offline checkbox to correctly not allow tristate.
    
    The auto-offline checkbox will now not allow tristate settings when
    the user has selected 'never ask me again' or checked/unchecked the
    checkbox (that is when dont_check_for_plasmoid is true). It is only in
    tristate before that happens when the checkbox will show up every time
    the user exits.
---
 config/telepathy-kded-config.cpp | 14 +++++++-------
 config/telepathy-kded-config.h   |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/telepathy-kded-config.cpp b/config/telepathy-kded-config.cpp
index fac1fc3..47ff70d 100644
--- a/config/telepathy-kded-config.cpp
+++ b/config/telepathy-kded-config.cpp
@@ -119,6 +119,8 @@ TelepathyKDEDConfig::TelepathyKDEDConfig(QWidget *parent, const QVariantList& ar
             this, SLOT(autoXAChecked(bool)));
     connect(ui->m_nowPlayingCheckBox, SIGNAL(clicked(bool)),
             this, SLOT(nowPlayingChecked(bool)));
+    connect(ui->m_autoOfflineCheckBox, SIGNAL(clicked(bool)),
+            this, SLOT(autoOfflineChecked(bool)));
 }
 
 TelepathyKDEDConfig::~TelepathyKDEDConfig()
@@ -223,14 +225,11 @@ void TelepathyKDEDConfig::load()
     if (dontCheckForPlasmoid) {
         bool shouldGoOffline = generalConfigGroup.readEntry("go_offline_when_closing", false);
         if (shouldGoOffline == true) {
-            ui->m_autoOfflineCheckBox->setTristate(true);
             ui->m_autoOfflineCheckBox->setChecked(true);
         } else {
-            ui->m_autoOfflineCheckBox->setTristate(true);
             ui->m_autoOfflineCheckBox->setChecked(false);
         }
     } else {
-      ui->m_autoOfflineCheckBox->setTristate(true);
       ui->m_autoOfflineCheckBox->setCheckState(Qt::PartiallyChecked);
     }
 }
@@ -291,10 +290,6 @@ void TelepathyKDEDConfig::save()
             notifyConfigGroup.writeEntry("dont_check_for_plasmoid", true);
             generalConfigGroup.writeEntry("go_offline_when_closing", true);
         break;
-        case Qt::PartiallyChecked:
-            notifyConfigGroup.deleteEntry("dont_check_for_plasmoid");
-            generalConfigGroup.writeEntry("go_offline_when_closing", oldGoOffline);
-        break;
     }
 
     generalConfigGroup.sync();
@@ -339,3 +334,8 @@ void TelepathyKDEDConfig::settingsHasChanged()
 {
     Q_EMIT changed(true);
 }
+
+void TelepathyKDEDConfig::autoOfflineChecked(bool checked)
+{
+    ui->m_autoOfflineCheckBox->setTristate(false);
+}
diff --git a/config/telepathy-kded-config.h b/config/telepathy-kded-config.h
index 8b27d13..b1bf626 100644
--- a/config/telepathy-kded-config.h
+++ b/config/telepathy-kded-config.h
@@ -45,6 +45,7 @@ private Q_SLOTS:
     void autoAwayChecked(bool checked);
     void autoXAChecked(bool checked);
     void nowPlayingChecked(bool checked);
+    void autoOfflineChecked(bool checked);
 
 private:
     QStringList m_tagNames;

-- 
ktp-kded-integration-module packaging