[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=672baeb

The following commit has been merged in the master branch:
commit 672baeb3d2cf590f0887d1db812f7b9a39bb11f7
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Sat Nov 16 12:09:25 2013 +0100

    Guard against null contact too
---
 KTp/global-contact-manager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/KTp/global-contact-manager.cpp b/KTp/global-contact-manager.cpp
index bb53c2d..d747ead 100644
--- a/KTp/global-contact-manager.cpp
+++ b/KTp/global-contact-manager.cpp
@@ -140,7 +140,8 @@ void GlobalContactManager::onContactManagerStateChanged(const Tp::ContactManager
 
 Tp::AccountPtr GlobalContactManager::accountForContact(const Tp::ContactPtr &contact) const
 {
-    if (!contact->manager()) {
+    if (!contact || !contact->manager()) {
+        kWarning() << "Null contact or contact manager!";
         return Tp::AccountPtr();
     }
     return accountForConnection(contact->manager()->connection());

-- 
ktp-common-internals packaging