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

The following commit has been merged in the master branch:
commit a3813a972b3f8047beda09363e8780862983dc00
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Nov 15 22:43:13 2013 +0100

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

diff --git a/KTp/global-contact-manager.cpp b/KTp/global-contact-manager.cpp
index 9203d2d..bb53c2d 100644
--- a/KTp/global-contact-manager.cpp
+++ b/KTp/global-contact-manager.cpp
@@ -140,6 +140,9 @@ void GlobalContactManager::onContactManagerStateChanged(const Tp::ContactManager
 
 Tp::AccountPtr GlobalContactManager::accountForContact(const Tp::ContactPtr &contact) const
 {
+    if (!contact->manager()) {
+        return Tp::AccountPtr();
+    }
     return accountForConnection(contact->manager()->connection());
 }
 

-- 
ktp-common-internals packaging