[SCM] modemmanager-qt packaging branch, master, updated. debian/5.37.0-2-87-gb819f43

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/modemmanager-qt.git;a=commitdiff;h=17e0ba0

The following commit has been merged in the master branch:
commit 17e0ba0d875dcdd138f1a6a00e414851877fdaa3
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Sat Apr 25 19:06:56 2015 +0200

     Add upstream_crash.diff from upstream LP:#1448502
    
    * Add upstream_crash.diff from upstream LP:#1448502
     - fixes crash on login when set up to use modems
---
 debian/changelog                   |  7 ++++
 debian/patches/series              |  1 +
 debian/patches/upstream_crash.diff | 82 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3f49ef7..0817cf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+modemmanager-qt (5.9.0-0ubuntu1.1) vivid; urgency=medium
+
+  * Add upstream_crash.diff from upstream LP:#1448502
+   - fixes crash on login when set up to use modems
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 25 Apr 2015 19:05:43 +0200
+
 modemmanager-qt (5.9.0-0ubuntu1) vivid; urgency=medium
 
   [ Harald Sitter ]
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1a686ec
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_crash.diff
diff --git a/debian/patches/upstream_crash.diff b/debian/patches/upstream_crash.diff
new file mode 100644
index 0000000..92169d4
--- /dev/null
+++ b/debian/patches/upstream_crash.diff
@@ -0,0 +1,82 @@
+diff --git a/src/modem.cpp b/src/modem.cpp
+index e595d25..5b052ed 100644
+--- a/src/modem.cpp
++++ b/src/modem.cpp
+@@ -172,27 +172,6 @@ ModemManager::ModemPrivate::ModemPrivate(const QString &path, Modem *q)
+     , q_ptr(q)
+ {
+     if (modemIface.isValid()) {
+-#if MM_CHECK_VERSION(1, 2, 0)
+-        QList<QDBusObjectPath> bearersList = modemIface.bearers();
+-        Q_FOREACH (const QDBusObjectPath & bearer, bearersList) {
+-            if (!bearers.contains(bearer.path())) {
+-                bearers.insert(bearer.path(), Bearer::Ptr());
+-                Q_EMIT q->bearerAdded(bearer.path());
+-            }
+-        }
+-#else
+-        QDBusPendingReply<QList<QDBusObjectPath> > reply = modemIface.ListBearers();
+-        reply.waitForFinished();
+-        if (reply.isValid()) {
+-            Q_FOREACH (const QDBusObjectPath & bearer, reply.value()) {
+-                if (!bearers.contains(bearer.path())) {
+-                    bearers.insert(bearer.path(), Bearer::Ptr());
+-                    Q_EMIT q->bearerAdded(bearer.path());
+-                }
+-            }
+-        }
+-#endif
+-
+         simPath = modemIface.sim().path();
+         Q_FOREACH (uint cap, modemIface.supportedCapabilities()) {
+             supportedCapabilities.append((MMModemCapability)cap);
+@@ -227,9 +206,37 @@ ModemManager::ModemPrivate::ModemPrivate(const QString &path, Modem *q)
+             currentBands.append((MMModemBand)band);
+         }
+         supportedIpFamilies = (ModemManager::Modem::IpBearerFamilies)modemIface.supportedIpFamilies();
++
++        QTimer::singleShot(0, this, &ModemManager::ModemPrivate::initializeBearers);
+     }
+ }
+ 
++void ModemManager::ModemPrivate::initializeBearers()
++{
++    Q_Q(Modem);
++
++#if MM_CHECK_VERSION(1, 2, 0)
++        QList<QDBusObjectPath> bearersList = modemIface.bearers();
++        Q_FOREACH (const QDBusObjectPath & bearer, bearersList) {
++            if (!bearers.contains(bearer.path())) {
++                bearers.insert(bearer.path(), Bearer::Ptr());
++                Q_EMIT q->bearerAdded(bearer.path());
++            }
++        }
++#else
++        QDBusPendingReply<QList<QDBusObjectPath> > reply = modemIface.ListBearers();
++        reply.waitForFinished();
++        if (reply.isValid()) {
++            Q_FOREACH (const QDBusObjectPath & bearer, reply.value()) {
++                if (!bearers.contains(bearer.path())) {
++                    bearers.insert(bearer.path(), Bearer::Ptr());
++                    Q_EMIT q->bearerAdded(bearer.path());
++                }
++            }
++        }
++#endif
++}
++
+ ModemManager::Modem::Modem(const QString &path, QObject *parent)
+     : Interface(*new ModemPrivate(path, this), parent)
+ {
+diff --git a/src/modem_p.h b/src/modem_p.h
+index 36b786b..2e6b8c1 100644
+--- a/src/modem_p.h
++++ b/src/modem_p.h
+@@ -74,6 +74,7 @@ public:
+     Q_DECLARE_PUBLIC(Modem)
+     Modem *q_ptr;
+ private Q_SLOTS:
++    void initializeBearers();
+     virtual void onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) Q_DECL_OVERRIDE;
+     void onStateChanged(int oldState, int newState, uint reason);
+ };
\ No newline at end of file

-- 
modemmanager-qt packaging