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

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

    Store the contact_resources config group as an accessible member of the TpAccountMonitor.
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=991808
---
 kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp | 8 ++++++++
 kpeople/nepomuk-feeder/telepathyaccountmonitor.h   | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp b/kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp
index 0cd2775..944b8aa 100644
--- a/kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp
+++ b/kpeople/nepomuk-feeder/telepathyaccountmonitor.cpp
@@ -29,6 +29,9 @@ TelepathyAccountMonitor::TelepathyAccountMonitor(QObject *parent)
  : QObject(parent),
    m_config(KGlobal::config())
 {
+    // Initialise the config group
+    m_contactResourcesConfigGroup = m_config->group("contact_resources");
+
     // Create an instance of the AccountManager and start to get it ready.
     m_accountManager = Tp::AccountManager::create();
 
@@ -78,3 +81,8 @@ void TelepathyAccountMonitor::onAccountRemoved(const QString &path)
     // TODO: Implement me!
 }
 
+KConfigGroup TelepathyAccountMonitor::contactResourcesConfigGroup()
+{
+    return m_contactResourcesConfigGroup;
+}
+
diff --git a/kpeople/nepomuk-feeder/telepathyaccountmonitor.h b/kpeople/nepomuk-feeder/telepathyaccountmonitor.h
index 0dcfcc9..fd7e4e8 100644
--- a/kpeople/nepomuk-feeder/telepathyaccountmonitor.h
+++ b/kpeople/nepomuk-feeder/telepathyaccountmonitor.h
@@ -23,6 +23,7 @@
 
 #include "telepathyaccount.h"
 
+#include <KConfigGroup>
 #include <KSharedConfig>
 
 #include <QtCore/QMap>
@@ -45,6 +46,8 @@ public:
 
     Tp::AccountManagerPtr accountManager();
 
+    KConfigGroup contactResourcesConfigGroup();
+
 private Q_SLOTS:
     void onAccountManagerReady(Tp::PendingOperation *op);
     void onAccountCreated(const QString &path);
@@ -54,6 +57,7 @@ private:
     Tp::AccountManagerPtr m_accountManager;
     QMap<QString, TelepathyAccount*> m_accounts;
     KSharedConfigPtr m_config;
+    KConfigGroup m_contactResourcesConfigGroup;
 };
 
 

-- 
ktp-common-internals packaging