[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=64ff72e

The following commit has been merged in the master branch:
commit 64ff72e65fcc586728bd93e8bd84858d2231596a
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Aug 6 15:45:38 2012 +0200

    Reparse the config file before reading it to prevent cached values
---
 autoaway.cpp                     | 2 ++
 config/telepathy-kded-config.cpp | 2 ++
 telepathy-mpris.cpp              | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/autoaway.cpp b/autoaway.cpp
index 7bde000..06cb8e0 100644
--- a/autoaway.cpp
+++ b/autoaway.cpp
@@ -83,6 +83,8 @@ void AutoAway::backFromIdle()
 void AutoAway::readConfig()
 {
     KSharedConfigPtr config = KSharedConfig::openConfig(QLatin1String("ktelepathyrc"));
+    config.data()->reparseConfiguration();
+
     KConfigGroup kdedConfig = config->group("KDED");
 
     bool autoAwayEnabled = kdedConfig.readEntry("autoAwayEnabled", true);
diff --git a/config/telepathy-kded-config.cpp b/config/telepathy-kded-config.cpp
index bbfc1d5..ba90f50 100644
--- a/config/telepathy-kded-config.cpp
+++ b/config/telepathy-kded-config.cpp
@@ -90,6 +90,8 @@ TelepathyKDEDConfig::TelepathyKDEDConfig(QWidget *parent, const QVariantList& ar
             this, SLOT(settingsHasChanged()));
     connect(ui->m_autoAcceptCheckBox, SIGNAL(stateChanged(int)),
             this, SLOT(settingsHasChanged()));
+    connect(ui->m_awayCheckBox, SIGNAL(stateChanged(int)),
+            this, SLOT(settingsHasChanged()));
     connect(ui->m_xaCheckBox, SIGNAL(stateChanged(int)),
             this, SLOT(settingsHasChanged()));
     connect(ui->m_awayMins, SIGNAL(valueChanged(int)),
diff --git a/telepathy-mpris.cpp b/telepathy-mpris.cpp
index 8386dd9..a071160 100644
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@ -167,6 +167,8 @@ void TelepathyMPRIS::detectPlayers()
 void TelepathyMPRIS::onSettingsChanged()
 {
     KSharedConfigPtr config = KSharedConfig::openConfig(QLatin1String("ktelepathyrc"));
+    config.data()->reparseConfiguration();
+
     KConfigGroup kdedConfig = config->group("KDED");
 
     bool pluginEnabled = kdedConfig.readEntry("nowPlayingEnabled", false);

-- 
ktp-kded-integration-module packaging