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

The following commit has been merged in the master branch:
commit eab867e5e6bbef22b9c57fccb0cd1f83511d8868
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Oct 18 14:07:33 2011 +0100

    Mpris module defaults to disabled
    
    Reviewed by: George Kiagiadakis
---
 config/telepathy-kded-config.cpp | 2 +-
 telepathy-mpris.cpp              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/telepathy-kded-config.cpp b/config/telepathy-kded-config.cpp
index dde5889..c7576b3 100644
--- a/config/telepathy-kded-config.cpp
+++ b/config/telepathy-kded-config.cpp
@@ -117,7 +117,7 @@ void TelepathyKDEDConfig::load()
     ui->m_xaMins->setEnabled(autoXAEnabled && autoAwayEnabled);
 
     //check if 'Now playing..' is enabled
-    bool nowPlayingEnabled = kdedConfig.readEntry(QLatin1String("nowPlayingEnabled"), true);
+    bool nowPlayingEnabled = kdedConfig.readEntry(QLatin1String("nowPlayingEnabled"), false);
     ui->m_nowPlayingCheckBox->setChecked(nowPlayingEnabled);
 
     //now playing text
diff --git a/telepathy-mpris.cpp b/telepathy-mpris.cpp
index 7ce9b20..f35bce8 100644
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@ -165,7 +165,7 @@ void TelepathyMPRIS::onSettingsChanged()
     KSharedConfigPtr config = KSharedConfig::openConfig(QLatin1String("ktelepathyrc"));
     KConfigGroup kdedConfig = config->group("KDED");
 
-    bool pluginEnabled = kdedConfig.readEntry("nowPlayingEnabled", true);
+    bool pluginEnabled = kdedConfig.readEntry("nowPlayingEnabled", false);
 
     //if the plugin was enabled and is now disabled
     if (isEnabled() && !pluginEnabled) {

-- 
ktp-kded-integration-module packaging