[SCM] modemmanager-qt packaging branch, kubuntu_vivid_archive, updated. debian/5.2.2-1-16-g8fc2289

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 8fc2289e18a4722bd3b40dec8b8f55e9ef920e6b
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Sat Apr 25 19:11:47 2015 +0200

    refresh
---
 debian/patches/upstream_crash.diff | 164 ++++++++++++++++++-------------------
 1 file changed, 82 insertions(+), 82 deletions(-)

diff --git a/debian/patches/upstream_crash.diff b/debian/patches/upstream_crash.diff
index 92169d4..07d9884 100644
--- a/debian/patches/upstream_crash.diff
+++ b/debian/patches/upstream_crash.diff
@@ -1,82 +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
+Index: modemmanager-qt-5.9.0/src/modem.cpp
+===================================================================
+--- modemmanager-qt-5.9.0.orig/src/modem.cpp
++++ modemmanager-qt-5.9.0/src/modem.cpp
+@@ -172,27 +172,6 @@ ModemManager::ModemPrivate::ModemPrivate
+     , 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
+             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)
+ {
+Index: modemmanager-qt-5.9.0/src/modem_p.h
+===================================================================
+--- modemmanager-qt-5.9.0.orig/src/modem_p.h
++++ modemmanager-qt-5.9.0/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);
+ };

-- 
modemmanager-qt packaging