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

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

    remove upstream patch
---
 debian/patches/series              |  1 -
 debian/patches/upstream_crash.diff | 82 --------------------------------------
 2 files changed, 83 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1a686ec..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_crash.diff
diff --git a/debian/patches/upstream_crash.diff b/debian/patches/upstream_crash.diff
deleted file mode 100644
index 92169d4..0000000
--- a/debian/patches/upstream_crash.diff
+++ /dev/null
@@ -1,82 +0,0 @@
-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