Solid::Networking::status() returning Solid::Networking::Status::Unknown (kde#270538)

This commit is contained in:
Rex Dieter 2011-04-19 14:33:19 -05:00
parent 05e9adc114
commit 23f43378ed
2 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,22 @@
commit 72cbad117d0abb4b47a5d00754ea465eda6c06b5
Author: Lamarque V. Souza <lamarque@gmail.com>
Date: Sun Apr 10 18:34:17 2011 -0300
Fix Solid::Networking::status() returning Solid::Networking::Unknown
sometimes.
BUG: 270538
FIXED-IN: 4.6.3
diff --git a/solid/solid/networking.cpp b/solid/solid/networking.cpp
index 6dd6553..02c7714 100644
--- a/solid/solid/networking.cpp
+++ b/solid/solid/networking.cpp
@@ -59,6 +59,7 @@ Solid::Networking::Notifier::Notifier()
void Solid::NetworkingPrivate::initialize()
{
QDBusPendingReply<uint> reply = iface->status();
+ reply.waitForFinished();
if (reply.isValid()) {
netStatus = ( Solid::Networking::Status )reply.value();
} else {

View File

@ -16,7 +16,7 @@
Summary: KDE Libraries
Version: 4.6.2
Release: 1%{?dist}
Release: 2%{?dist}
Name: kdelibs
Epoch: 6
@ -91,6 +91,8 @@ Patch27: kdelibs-4.5.80-no_rpath.patch
Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
## upstream
# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/72cbad117d0abb4b47a5d00754ea465eda6c06b5
Patch100: kdelibs-4.6.2-kde270538.patch
## security fix
# Not Upstreamed? why not ? -- Rex
@ -275,6 +277,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch50 -p1 -b .knewstuff_gpg2
# upstream patches
%patch100 -p1 -b .kde270538
# security fix
%patch200 -p1 -b .CVE-2009-2702
@ -530,6 +533,9 @@ rm -rf %{buildroot}
%changelog
* Tue Apr 19 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.2-2
- Solid::Networking::status() returning Solid::Networking::Status::Unknown (kde#270538)
* Wed Apr 06 2011 Jaroslav Reznik <jreznik@redhat.com> 4.6.2-1
- 4.6.2