[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=40fee1f

The following commit has been merged in the master branch:
commit 40fee1f790bb63d9ed8bbe9daeb886071124b606
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Feb 9 19:55:13 2014 +0100

    Avoid crash if account does not exist
---
 KTp/global-contact-manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/global-contact-manager.cpp b/KTp/global-contact-manager.cpp
index eec0d4f..fb69bd2 100644
--- a/KTp/global-contact-manager.cpp
+++ b/KTp/global-contact-manager.cpp
@@ -189,7 +189,7 @@ KTp::ContactPtr GlobalContactManager::contactForContactId(const QString &account
     }
 
     Tp::AccountPtr account = d->accountManager->accountForObjectPath(accountPath);
-    if (account->connection() && account->connection()->contactManager()) {
+    if (account && account->connection() && account->connection()->contactManager()) {
         Tp::Contacts contactSet = account->connection()->contactManager()->allKnownContacts();
         Q_FOREACH (const Tp::ContactPtr &contact, contactSet) {
             if (contact->id() == contactId) {

-- 
ktp-common-internals packaging