[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=db35f0b

The following commit has been merged in the master branch:
commit db35f0b448c2b92253c0221720f79e4b055626f5
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Sun Jul 5 17:46:34 2009 +0000

    Add a KSharedConfig member to the TelepathyAccountMonitor.
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=991807
---
 kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp | 6 ++++--
 kpeople/nepomuk-feeder/telepathyaccountmonitor.h   | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp b/kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp
index 921a6b3..0cd2775 100644
--- a/kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp
+++ b/kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp
@@ -20,12 +20,14 @@
 
 #include "telepathyaccountmonitor.h"
 
-#include <kdebug.h>
+#include <KDebug>
+#include <KGlobal>
 
 #include <TelepathyQt4/PendingReady>
 
 TelepathyAccountMonitor::TelepathyAccountMonitor(QObject *parent)
- : QObject(parent)
+ : QObject(parent),
+   m_config(KGlobal::config())
 {
     // Create an instance of the AccountManager and start to get it ready.
     m_accountManager = Tp::AccountManager::create();
diff --git a/kpeople/nepomuk-feeder/telepathyaccountmonitor.h b/kpeople/nepomuk-feeder/telepathyaccountmonitor.h
index 169d34f..0dcfcc9 100644
--- a/kpeople/nepomuk-feeder/telepathyaccountmonitor.h
+++ b/kpeople/nepomuk-feeder/telepathyaccountmonitor.h
@@ -23,6 +23,8 @@
 
 #include "telepathyaccount.h"
 
+#include <KSharedConfig>
+
 #include <QtCore/QMap>
 #include <QtCore/QObject>
 #include <QtCore/QString>
@@ -51,6 +53,7 @@ private Q_SLOTS:
 private:
     Tp::AccountManagerPtr m_accountManager;
     QMap<QString, TelepathyAccount*> m_accounts;
+    KSharedConfigPtr m_config;
 };
 
 

-- 
ktp-common-internals packaging