[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=4e667d0

The following commit has been merged in the master branch:
commit 4e667d00910407a477b63546b3adf84a40ab1239
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Jan 16 20:40:20 2014 +0100

    Do not create GlobalContactManager with null AccountManager
---
 KTp/core.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/core.cpp b/KTp/core.cpp
index 2ee7594..1898dc1 100644
--- a/KTp/core.cpp
+++ b/KTp/core.cpp
@@ -115,7 +115,7 @@ Tp::AccountManagerPtr KTp::accountManager()
 KTp::GlobalContactManager* KTp::contactManager()
 {
     if (!s_instance->m_contactManager) {
-        s_instance->m_contactManager = new KTp::GlobalContactManager(s_instance->m_accountManager, 0);
+        s_instance->m_contactManager = new KTp::GlobalContactManager(KTp::accountManager(), 0);
     }
 
     return s_instance->m_contactManager;

-- 
ktp-common-internals packaging