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

The following commit has been merged in the master branch:
commit bd3ac8f134324bcc5452581a7627e4f9311bcea7
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Sep 26 20:52:06 2011 +0200

    Use values from config file
---
 autoaway.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/autoaway.cpp b/autoaway.cpp
index f73d6a6..596f342 100644
--- a/autoaway.cpp
+++ b/autoaway.cpp
@@ -19,17 +19,32 @@
 
 #include "autoaway.h"
 
-#include <KIdleTime>
 #include <TelepathyQt4/AccountManager>
 #include <TelepathyQt4/AccountSet>
+
 #include <KDebug>
+#include <KIdleTime>
+#include <KConfig>
+#include <KConfigGroup>
 
 AutoAway::AutoAway(const Tp::AccountManagerPtr& am, QObject* parent)
     : QObject(parent)
 {
+    KSharedConfigPtr config = KSharedConfig::openConfig(QLatin1String("ktelepathyrc"));
+    KConfigGroup kdedConfig = config->group("KDED");
+
+    bool autoAwayEnabled = kdedConfig.readEntry("autoAwayEnabled", true);
+    bool autoXAEnabled = kdedConfig.readEntry("autoXAEnabled", true);
+
     m_accountManager = am;
-    m_awayTimeoutId = KIdleTime::instance()->addIdleTimeout(10 * 1000);
-    m_extAwayTimeoutId = KIdleTime::instance()->addIdleTimeout(20 * 1000);
+    if (autoAwayEnabled) {
+        int awayTime = kdedConfig.readEntry("awayAfter", 5);
+        m_awayTimeoutId = KIdleTime::instance()->addIdleTimeout(awayTime);
+    }
+    if (autoAwayEnabled && autoXAEnabled) {
+        int xaTime = kdedConfig.readEntry("xaAfter", 15);
+        m_extAwayTimeoutId = KIdleTime::instance()->addIdleTimeout(xaTime);
+    }
     m_prevPresence = Tp::Presence::available();
 
     connect(KIdleTime::instance(), SIGNAL(timeoutReached(int)),

-- 
ktp-kded-integration-module packaging