[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=147144b

The following commit has been merged in the master branch:
commit 147144b65d8830f3f229a20e5124136aeb11fc5a
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Nov 15 23:27:13 2013 +0100

    Add GlobalContactManager as a global singleton to KTp::Core
---
 KTp/core.cpp | 14 +++++++++++++-
 KTp/core.h   |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/KTp/core.cpp b/KTp/core.cpp
index 87efe15..878987d 100644
--- a/KTp/core.cpp
+++ b/KTp/core.cpp
@@ -29,6 +29,7 @@
 #include <KGlobal>
 
 #include <TelepathyQt/AccountManager>
+#include <KTp/global-contact-manager.h>
 #include "contact-factory.h"
 
 class CorePrivate
@@ -37,10 +38,12 @@ public:
     CorePrivate();
     bool m_kPeopleEnabled;
     Tp::AccountManagerPtr m_accountManager;
+    KTp::GlobalContactManager *m_contactManager;
 };
 
 CorePrivate::CorePrivate()
-    : m_kPeopleEnabled(false)
+    : m_kPeopleEnabled(false),
+      m_contactManager(0)
 {
     //if built with kpeople support, enable kpeople if Nepomuk is running
     #ifdef HAVE_KPEOPLE
@@ -92,3 +95,12 @@ Tp::AccountManagerPtr KTp::accountManager()
 {
     return s_instance->m_accountManager;
 }
+
+KTp::GlobalContactManager* KTp::contactManager()
+{
+    if (!s_instance->m_contactManager) {
+        s_instance->m_contactManager = new KTp::GlobalContactManager(s_instance->m_accountManager, 0);
+    }
+
+    return s_instance->m_contactManager;
+}
diff --git a/KTp/core.h b/KTp/core.h
index a1ccd02..9db9cf4 100644
--- a/KTp/core.h
+++ b/KTp/core.h
@@ -24,6 +24,8 @@
 
 namespace KTp
 {
+class GlobalContactManager;
+
     KTP_EXPORT bool kpeopleEnabled();
 
 
@@ -38,4 +40,6 @@ namespace KTp
         It is best not to use this method. It's only half complete.
      */
     KTP_EXPORT Tp::AccountManagerPtr accountManager();
+
+    KTP_EXPORT KTp::GlobalContactManager* contactManager();
 }

-- 
ktp-common-internals packaging