[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:04:54 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=42886f4

The following commit has been merged in the master branch:
commit 42886f479be4d120b534c682643e91bf3558329f
Author: Anant Kamath <kamathanant at gmail.com>
Date:   Fri Sep 13 00:04:45 2013 +0530

    Fixed crash while loading the pintxo plugin when encountering ModemManager DBus errors
---
 plugins/pintxo/modem-combobox.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/pintxo/modem-combobox.cpp b/plugins/pintxo/modem-combobox.cpp
index 1e064e5..db949c4 100644
--- a/plugins/pintxo/modem-combobox.cpp
+++ b/plugins/pintxo/modem-combobox.cpp
@@ -21,6 +21,7 @@
 #include "modem-combobox.h"
 
 #include <QDebug>
+#include <QDBusReply>
 
 #include <ModemManagerQt/manager.h>
 #include <ModemManagerQt/modemgsmcardinterface.h>
@@ -33,8 +34,8 @@ ModemComboBox::ModemComboBox(QWidget* parent) : QComboBox(parent)
             ModemManager::ModemGsmCardInterface::Ptr simCard = ModemManager::findModemInterface(modem->udi(), ModemManager::ModemInterface::GsmCard).objectCast<ModemManager::ModemGsmCardInterface>();
             if(!simCard.isNull()) {
                 QString simIdent = simCard->getSimIdentifier();
-                QString spn = simCard->getSpn();
-                addItem(spn.isEmpty() ? QLatin1String("Unknown modem") : spn);
+                QDBusReply<QString> spn  = simCard->getSpn();
+                addItem(spn.isValid() ? spn.value() : QLatin1String("Unknown modem"));
             }
         }
     }

-- 
ktp-accounts-kcm packaging



More information about the pkg-kde-commits mailing list