[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=1ea924c

The following commit has been merged in the master branch:
commit 1ea924c78070ff07201a61a25f730d2ad8a1db48
Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Fri Dec 20 03:22:58 2013 +0600

    KTp::Contact: Check manager() pointer for null in *Capability() methods.
    
    BUG: 328696
    REVIEW: 114549
---
 KTp/contact.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/KTp/contact.cpp b/KTp/contact.cpp
index f3cae7b..52a4f58 100644
--- a/KTp/contact.cpp
+++ b/KTp/contact.cpp
@@ -50,7 +50,7 @@ KTp::Presence KTp::Contact::presence() const
 
 bool KTp::Contact::textChatCapability() const
 {
-    if (!manager()->connection()) {
+    if (!manager() || !manager()->connection()) {
         return false;
     }
 
@@ -59,7 +59,7 @@ bool KTp::Contact::textChatCapability() const
 
 bool KTp::Contact::audioCallCapability() const
 {
-    if (!manager()->connection()) {
+    if (!manager() || !manager()->connection()) {
         return false;
     }
 
@@ -73,7 +73,7 @@ bool KTp::Contact::audioCallCapability() const
 
 bool KTp::Contact::videoCallCapability() const
 {
-    if (!manager()->connection()) {
+    if (!manager() || !manager()->connection()) {
         return false;
     }
 
@@ -87,7 +87,7 @@ bool KTp::Contact::videoCallCapability() const
 
 bool KTp::Contact::fileTransferCapability()  const
 {
-    if (!manager()->connection()) {
+    if (!manager() || !manager()->connection()) {
         return false;
     }
 
@@ -98,7 +98,7 @@ bool KTp::Contact::fileTransferCapability()  const
 
 bool KTp::Contact::collaborativeEditingCapability() const
 {
-    if (!manager()->connection()) {
+    if (!manager() || !manager()->connection()) {
         return false;
     }
 
@@ -110,7 +110,7 @@ bool KTp::Contact::collaborativeEditingCapability() const
 
 QStringList KTp::Contact::dbusTubeServicesCapability() const
 {
-    if (!manager()->connection()) {
+    if (!manager() || !manager()->connection()) {
         return QStringList();
     }
 
@@ -120,7 +120,7 @@ QStringList KTp::Contact::dbusTubeServicesCapability() const
 
 QStringList KTp::Contact::streamTubeServicesCapability() const
 {
-    if (!manager()->connection()) {
+    if (!manager() || !manager()->connection()) {
         return QStringList();
     }
 

-- 
ktp-common-internals packaging