Merge lp:~apachelogger/kubuntu-packaging/qtbase-opensource-src-fixkonvi into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src

Proposed by Harald Sitter
Status: Merged
Merged at revision: 230
Proposed branch: lp:~apachelogger/kubuntu-packaging/qtbase-opensource-src-fixkonvi
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src
Diff against target: 66 lines (+46/-0)
3 files modified
debian/changelog (+8/-0)
debian/patches/series (+1/-0)
debian/patches/upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch (+37/-0)
To merge this branch: bzr merge lp:~apachelogger/kubuntu-packaging/qtbase-opensource-src-fixkonvi
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+250721@code.launchpad.net

Description of the change

fixes qnetworkconfigurationmanager getting confused with both ethernet and wifi

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-02-23 09:58:44 +0000
3+++ debian/changelog 2015-02-24 08:39:20 +0000
4@@ -1,3 +1,11 @@
5+qtbase-opensource-src (5.4.0+dfsg-4ubuntu4) UNRELEASED; urgency=medium
6+
7+ * Add upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch
8+ To prevent connection states from getting lost resulting in QNCM thinking
9+ the system is offline when in fact it isn't (LP: #1424960)
10+
11+ -- Harald Sitter <sitter@kde.org> Tue, 24 Feb 2015 09:22:42 +0100
12+
13 qtbase-opensource-src (5.4.0+dfsg-4ubuntu3) vivid; urgency=medium
14
15 [ Scott Kitterman ]
16
17=== modified file 'debian/patches/series'
18--- debian/patches/series 2015-02-23 09:58:44 +0000
19+++ debian/patches/series 2015-02-24 08:39:20 +0000
20@@ -30,3 +30,4 @@
21 upstream_xcb-Update-mouse-buttons-from-MotionNotify-events.patch
22 upstream_Handle-SelectionClientClose-in-QXcbClipboard.patch
23 upstream-gerrit_Handle-SelectionWindowDestroy-in-QXcbClipboard.patch
24+upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch
25
26=== added file 'debian/patches/upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch'
27--- debian/patches/upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch 1970-01-01 00:00:00 +0000
28+++ debian/patches/upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch 2015-02-24 08:39:20 +0000
29@@ -0,0 +1,37 @@
30+From 8d6341a721d07e3cc30032bcc89f7e25cb00b9eb Mon Sep 17 00:00:00 2001
31+From: Albert Astals Cid <aacid@kde.org>
32+Date: Mon, 16 Feb 2015 22:53:02 +0100
33+Subject: [PATCH] Call [ofono|nm]Registered delayed in constructor otherwise
34+ signals will be lost
35+
36+If we call them just in the constructor all the signals they sent
37+out can't be connected and will be lost, particularly this means
38+the QNetworkConfigurationManager doesn't see my ethernet connection
39+and thus thinks i'm not online
40+
41+Change-Id: I1480f76338d6ae4fbed676f9fa40ada18ea431ad
42+Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
43+---
44+ src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp | 4 ++--
45+ 1 file changed, 2 insertions(+), 2 deletions(-)
46+
47+diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
48+index f52b9d4..0378ac7 100644
49+--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
50++++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
51+@@ -80,10 +80,10 @@ QNetworkManagerEngine::QNetworkManagerEngine(QObject *parent)
52+ this, SLOT(ofonoUnRegistered(QString)));
53+
54+ if (QDBusConnection::systemBus().interface()->isServiceRegistered("org.ofono"))
55+- ofonoRegistered();
56++ QMetaObject::invokeMethod(this, "ofonoRegistered", Qt::QueuedConnection);
57+
58+ if (QDBusConnection::systemBus().interface()->isServiceRegistered(NM_DBUS_SERVICE))
59+- nmRegistered();
60++ QMetaObject::invokeMethod(this, "nmRegistered", Qt::QueuedConnection);
61+ }
62+
63+ QNetworkManagerEngine::~QNetworkManagerEngine()
64+--
65+2.1.4
66+

Subscribers

People subscribed via source and target branches