[SCM] plasma-nm packaging branch, master, updated. debian/0.9.3.4-1-5-g18dd2d8
Maximiliano Curia
maxy at moszumanska.debian.org
Mon Sep 22 16:40:43 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/plasma-nm.git;a=commitdiff;h=850cc43
The following commit has been merged in the master branch:
commit 850cc43d61e71cffcd2d8ebb3381762404ae2a2c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Mon Sep 15 09:53:02 2014 +0200
Import upstream fixes for #758863
---
debian/changelog | 5 +-
debian/patches/series | 3 +
debian/patches/upstream-delay_the_notifications | 134 ++++++++++++++++++++++++
debian/patches/upstream-fix_build_replace | 46 ++++++++
debian/patches/upstream-use_proper_kded | 19 ++++
5 files changed, 206 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 4e51fe5..7f50f0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
plasma-nm (0.9.3.4-2~) UNRELEASED; urgency=medium
- *
+ * New patch: upstream-delay_the_notifications (Closes: #758863) Thanks
+ to Ralf Jung
+ * New patch: upstream-use_proper_kded
+ * New patch: upstream-fix_build_replace
-- Maximiliano Curia <maxy at debian.org> Sun, 14 Sep 2014 17:17:03 +0200
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..700ad47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+upstream-delay_the_notifications
+upstream-use_proper_kded
+upstream-fix_build_replace
diff --git a/debian/patches/upstream-delay_the_notifications b/debian/patches/upstream-delay_the_notifications
new file mode 100644
index 0000000..ad01d19
--- /dev/null
+++ b/debian/patches/upstream-delay_the_notifications
@@ -0,0 +1,134 @@
+commit 81839a1566d0c0209a308d71b03837f996a19c96
+Author: Lukáš Tinkl <lukas at kde.org>
+Date: Sat Sep 6 17:54:00 2014 +0200
+
+ delay the notifications and secret agent initializations until needed
+
+ BUG:338513
+ REVIEW:120082
+
+diff --git a/kded/service.cpp b/kded/service.cpp
+index ec21b45..a27c148 100644
+--- a/kded/service.cpp
++++ b/kded/service.cpp
+@@ -57,19 +57,13 @@ NetworkManagementService::NetworkManagementService(QObject * parent, const QVari
+ {
+ Q_D(NetworkManagementService);
+
+- QDBusReply<bool> notificationsReply = QDBusConnection::sessionBus().interface()->isServiceRegistered("org.freedesktop.Notifications");
+- if (notificationsReply.value()) {
+- initializeNotifications();
+- } else {
+- QDBusServiceWatcher * watcher = new QDBusServiceWatcher("org.freedesktop.Notifications", QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForOwnerChange, this);
+- connect(watcher, SIGNAL(serviceRegistered()), this, SLOT(doInitializeNotifications()));
+- }
++ d->agent = Q_NULLPTR;
++ d->notification = Q_NULLPTR;
+
+ #if WITH_MODEMMANAGER_SUPPORT
+- d->modemMonitor = new ModemMonitor(this);
++ d->modemMonitor = Q_NULLPTR;
+ #endif
+- d->bluetoothMonitor = new BluetoothMonitor(this);
+- d->agent = new SecretAgent(this);
++ d->bluetoothMonitor = Q_NULLPTR;
+ }
+
+ NetworkManagementService::~NetworkManagementService()
+@@ -77,17 +71,25 @@ NetworkManagementService::~NetworkManagementService()
+ delete d_ptr;
+ }
+
+-void NetworkManagementService::doInitializeNotifications()
++void NetworkManagementService::init()
+ {
+- QDBusServiceWatcher * watcher = static_cast<QDBusServiceWatcher*>(sender());
+- watcher->deleteLater();
++ Q_D(NetworkManagementService);
+
+- initializeNotifications();
+-}
++ if (!d->agent) {
++ d->agent = new SecretAgent(this);
++ }
+
+-void NetworkManagementService::initializeNotifications()
+-{
+- Q_D(NetworkManagementService);
++ if (!d->notification) {
++ d->notification = new Notification(this);
++ }
++
++#if WITH_MODEMMANAGER_SUPPORT
++ if (!d->modemMonitor) {
++ d->modemMonitor = new ModemMonitor(this);
++ }
++#endif
+
+- d->notification = new Notification(this);
++ if (!d->bluetoothMonitor) {
++ d->bluetoothMonitor = new BluetoothMonitor(this);
++ }
+ }
+diff --git a/kded/service.h b/kded/service.h
+index ef626eb..08d90fd 100644
+--- a/kded/service.h
++++ b/kded/service.h
+@@ -35,18 +35,18 @@ class NetworkManagementServicePrivate;
+
+ class PLASMA_NM_EXPORT NetworkManagementService : public KDEDModule
+ {
++ Q_CLASSINFO("D-Bus Interface", "org.kde.plasmanetworkmanagement")
+ Q_OBJECT
+ Q_DECLARE_PRIVATE(NetworkManagementService)
+ public:
+ NetworkManagementService(QObject * parent, const QVariantList&);
+ virtual ~NetworkManagementService();
++
+ public Q_SLOTS:
+- void doInitializeNotifications();
++ Q_SCRIPTABLE void init();
+
+ private:
+ NetworkManagementServicePrivate * d_ptr;
+-
+- void initializeNotifications();
+ };
+
+ #endif // PLASMANM_KDED_SERVICE_H
+diff --git a/libs/handler.cpp b/libs/handler.cpp
+index 875ef03..cb8e71f 100644
+--- a/libs/handler.cpp
++++ b/libs/handler.cpp
+@@ -53,7 +53,10 @@ Handler::Handler(QObject* parent)
+ , m_tmpWimaxEnabled(NetworkManager::isWimaxEnabled())
+ , m_tmpWirelessEnabled(NetworkManager::isWirelessEnabled())
+ , m_tmpWwanEnabled(NetworkManager::isWwanEnabled())
++ , m_agentIface(QStringLiteral("org.kde.kded5"), QStringLiteral("/modules/networkmanagement"),
++ QStringLiteral("org.kde.plasmanetworkmanagement"))
+ {
++ m_agentIface.call(QStringLiteral("init"));
+ }
+
+ Handler::~Handler()
+diff --git a/libs/handler.h b/libs/handler.h
+index 23a4628..d614e82 100644
+--- a/libs/handler.h
++++ b/libs/handler.h
+@@ -21,6 +21,8 @@
+ #ifndef PLASMA_NM_HANDLER_H
+ #define PLASMA_NM_HANDLER_H
+
++#include <QDBusInterface>
++
+ #include <NetworkManagerQt/Connection>
+
+ #include "plasmanm_export.h"
+@@ -109,6 +111,7 @@ private:
+ QString m_tmpSpecificPath;
+
+ bool isBtEnabled();
++ QDBusInterface m_agentIface;
+ };
+
+ #endif // PLASMA_NM_HANDLER_H
diff --git a/debian/patches/upstream-fix_build_replace b/debian/patches/upstream-fix_build_replace
new file mode 100644
index 0000000..77815c8
--- /dev/null
+++ b/debian/patches/upstream-fix_build_replace
@@ -0,0 +1,46 @@
+commit fd26f6e00b115912b8355f292f15eb197420fb6d
+Author: Jan Grulich <jgrulich at redhat.com>
+Date: Sun Sep 7 11:26:47 2014 +0200
+
+ Fix build: replace Qt5 stuff
+
+diff --git a/kded/service.cpp b/kded/service.cpp
+index a27c148..3d30e1f 100644
+--- a/kded/service.cpp
++++ b/kded/service.cpp
+@@ -57,13 +57,13 @@ NetworkManagementService::NetworkManagementService(QObject * parent, const QVari
+ {
+ Q_D(NetworkManagementService);
+
+- d->agent = Q_NULLPTR;
+- d->notification = Q_NULLPTR;
++ d->agent = 0;
++ d->notification = 0;
+
+ #if WITH_MODEMMANAGER_SUPPORT
+- d->modemMonitor = Q_NULLPTR;
++ d->modemMonitor = 0;
+ #endif
+- d->bluetoothMonitor = Q_NULLPTR;
++ d->bluetoothMonitor = 0;
+ }
+
+ NetworkManagementService::~NetworkManagementService()
+diff --git a/libs/handler.cpp b/libs/handler.cpp
+index d3c1454..7a31787 100644
+--- a/libs/handler.cpp
++++ b/libs/handler.cpp
+@@ -53,10 +53,10 @@ Handler::Handler(QObject* parent)
+ , m_tmpWimaxEnabled(NetworkManager::isWimaxEnabled())
+ , m_tmpWirelessEnabled(NetworkManager::isWirelessEnabled())
+ , m_tmpWwanEnabled(NetworkManager::isWwanEnabled())
+- , m_agentIface(QStringLiteral("org.kde.kded"), QStringLiteral("/modules/networkmanagement"),
+- QStringLiteral("org.kde.plasmanetworkmanagement"))
++ , m_agentIface(QLatin1String("org.kde.kded"), QLatin1String("/modules/networkmanagement"),
++ QLatin1String("org.kde.plasmanetworkmanagement"))
+ {
+- m_agentIface.call(QStringLiteral("init"));
++ m_agentIface.call(QLatin1String("init"));
+ }
+
+ Handler::~Handler()
diff --git a/debian/patches/upstream-use_proper_kded b/debian/patches/upstream-use_proper_kded
new file mode 100644
index 0000000..80a59ee
--- /dev/null
+++ b/debian/patches/upstream-use_proper_kded
@@ -0,0 +1,19 @@
+commit c48c8321bca526787959c6ca5cb6d92c8b42882e
+Author: Jan Grulich <jgrulich at redhat.com>
+Date: Sun Sep 7 11:23:18 2014 +0200
+
+ Use proper kded service name
+
+diff --git a/libs/handler.cpp b/libs/handler.cpp
+index cb8e71f..d3c1454 100644
+--- a/libs/handler.cpp
++++ b/libs/handler.cpp
+@@ -53,7 +53,7 @@ Handler::Handler(QObject* parent)
+ , m_tmpWimaxEnabled(NetworkManager::isWimaxEnabled())
+ , m_tmpWirelessEnabled(NetworkManager::isWirelessEnabled())
+ , m_tmpWwanEnabled(NetworkManager::isWwanEnabled())
+- , m_agentIface(QStringLiteral("org.kde.kded5"), QStringLiteral("/modules/networkmanagement"),
++ , m_agentIface(QStringLiteral("org.kde.kded"), QStringLiteral("/modules/networkmanagement"),
+ QStringLiteral("org.kde.plasmanetworkmanagement"))
+ {
+ m_agentIface.call(QStringLiteral("init"));
--
plasma-nm packaging
More information about the pkg-kde-commits
mailing list