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

The following commit has been merged in the master branch:
commit 4db37cea05ea400430c7f76f3088dd7f70a2f5d5
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Sat Apr 4 01:06:47 2015 +0200

    Guard against null connection
---
 KTp/contact.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/contact.cpp b/KTp/contact.cpp
index e7e83e1..e498724 100644
--- a/KTp/contact.cpp
+++ b/KTp/contact.cpp
@@ -54,7 +54,7 @@ void KTp::Contact::onPresenceChanged(const Tp::Presence &presence)
 
 QString KTp::Contact::accountUniqueIdentifier() const
 {
-    if (m_accountUniqueIdentifier.isEmpty()) {
+    if (m_accountUniqueIdentifier.isEmpty() && manager()->connection()) {
         const_cast<KTp::Contact*>(this)->m_accountUniqueIdentifier = manager()->connection()->property("accountUID").toString();
     }
     return m_accountUniqueIdentifier;

-- 
ktp-common-internals packaging