[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=2c0a138

The following commit has been merged in the master branch:
commit 2c0a13825776ca1bd97f5011c821c577305009a9
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Sep 10 21:51:08 2015 +0200

    Check PendingReady return values
    
    Apparently you can get a valid accountset without a valid filter, which
    then crashes
    
    BUG: 352532
---
 telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp b/telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp
index d8d1996..c5d694f 100644
--- a/telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp
+++ b/telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp
@@ -44,7 +44,11 @@ ConnectProtocolPtr KDEConnectTelepathyProtocolFactory::interface() {
         //maybe this should be per device.. with a device ID as a parameter, but lets keep it connect for now
         
         Tp::AccountManagerPtr am = Tp::AccountManager::create(QDBusConnection::sessionBus());
-        QObject::connect(am->becomeReady(), &Tp::PendingOperation::finished, [am]() {
+        Tp::PendingReady *pr = am->becomeReady();
+        QObject::connect(pr, &Tp::PendingOperation::finished, [pr,am]() {
+           if (pr->isError()) {
+               return;
+           }
            Tp::AccountSetPtr accounts = am->accountsByProtocol("kdeconnect");
            if (!accounts) {
                return;
@@ -52,7 +56,7 @@ ConnectProtocolPtr KDEConnectTelepathyProtocolFactory::interface() {
            if (accounts->accounts().isEmpty()) {
                 Tp::PendingAccount* pa = am->createAccount("kdeconnect", "kdeconnect", "kdeconnect", QVariantMap(), QVariantMap());
                 QObject::connect(pa, &Tp::PendingOperation::finished, pa, [pa](){
-                    if (!pa->account()) {
+                    if (pa->isError() || !pa->account()) {
                         return;
                     }
                     pa->account()->setEnabled(true);

-- 
kdeconnect packaging