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

The following commit has been merged in the master branch:
commit e94144c93ed23f02e14452f9e5003e4d19663b49
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Apr 1 18:18:23 2013 +0100

    Supress warnings about invalid ClientTypes
    
    Reviewed-by: Aleix Pol
---
 KTp/contact.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/KTp/contact.cpp b/KTp/contact.cpp
index 4fa37d5..c9f857b 100644
--- a/KTp/contact.cpp
+++ b/KTp/contact.cpp
@@ -103,6 +103,11 @@ QStringList KTp::Contact::clientTypes() const
         return QStringList();
     }
 
+    //supress any errors trying to access ClientTypes when we don't have them
+    if (! actualFeatures().contains(Tp::Contact::FeatureClientTypes)) {
+        return QStringList();
+    }
+
     return Tp::Contact::clientTypes();
 }
 

-- 
ktp-common-internals packaging