From kde-commits  Tue Jul 17 10:49:16 2012
From: Lukas Tinkl <lukas () kde ! org>
Date: Tue, 17 Jul 2012 10:49:16 +0000
To: kde-commits
Subject: [kdelibs/KDE/4.9] solid/solid/backends: Fix solid udisk/upower property queries
Message-Id: <20120717104916.6905CA6094 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=134252240923931

Git commit 5d177ee7aaf40df16c88f8ee602819159b747f9d by Lukas Tinkl.
Committed on 17/07/2012 at 12:48.
Pushed by lukas into branch 'KDE/4.9'.

Fix solid udisk/upower property queries

REVIEW: 103902
BUG: 293495

M  +1    -0    solid/solid/backends/udisks/udisksdevice.cpp
M  +6    -0    solid/solid/backends/udisks/udisksmanager.cpp
M  +1    -0    solid/solid/backends/upower/upowerdevice.cpp
M  +6    -0    solid/solid/backends/upower/upowermanager.cpp

http://commits.kde.org/kdelibs/5d177ee7aaf40df16c88f8ee602819159b747f9d

diff --git a/solid/solid/backends/udisks/udisksdevice.cpp b/solid/solid/bac=
kends/udisks/udisksdevice.cpp
index 2e38c9f..1004364 100644
--- a/solid/solid/backends/udisks/udisksdevice.cpp
+++ b/solid/solid/backends/udisks/udisksdevice.cpp
@@ -715,6 +715,7 @@ QMap<QString, QVariant> UDisksDevice::allProperties() c=
onst
 {
     QDBusMessage call =3D QDBusMessage::createMethodCall(m_device->service=
(), m_device->path(),
                                                        "org.freedesktop.DB=
us.Properties", "GetAll");
+    call << m_device->interface();
     QDBusPendingReply< QVariantMap > reply =3D QDBusConnection::systemBus(=
).asyncCall(call);
     reply.waitForFinished();
 =

diff --git a/solid/solid/backends/udisks/udisksmanager.cpp b/solid/solid/ba=
ckends/udisks/udisksmanager.cpp
index 01db48f..e18cc66 100644
--- a/solid/solid/backends/udisks/udisksmanager.cpp
+++ b/solid/solid/backends/udisks/udisksmanager.cpp
@@ -108,6 +108,9 @@ QStringList UDisksManager::devicesFromQuery(const QStri=
ng& parentUdi, Solid::Dev
     {
         foreach (const QString &udi, deviceCache())
         {
+            if (udi=3D=3DudiPrefix())
+                continue;
+
             UDisksDevice device(udi);
             if (device.queryDeviceInterface(type) && device.parentUdi() =
=3D=3D parentUdi)
                 result << udi;
@@ -119,6 +122,9 @@ QStringList UDisksManager::devicesFromQuery(const QStri=
ng& parentUdi, Solid::Dev
     {
         foreach (const QString &udi, deviceCache())
         {
+            if (udi=3D=3DudiPrefix())
+                continue;
+
             UDisksDevice device(udi);
             if (device.queryDeviceInterface(type))
                 result << udi;
diff --git a/solid/solid/backends/upower/upowerdevice.cpp b/solid/solid/bac=
kends/upower/upowerdevice.cpp
index 0858f14..5b672c7 100644
--- a/solid/solid/backends/upower/upowerdevice.cpp
+++ b/solid/solid/backends/upower/upowerdevice.cpp
@@ -200,6 +200,7 @@ QMap<QString, QVariant> UPowerDevice::allProperties() c=
onst
 {
     QDBusMessage call =3D QDBusMessage::createMethodCall(m_device.service(=
), m_device.path(),
                                                        "org.freedesktop.DB=
us.Properties", "GetAll");
+    call << m_device.interface();
     QDBusPendingReply< QVariantMap > reply =3D QDBusConnection::systemBus(=
).asyncCall(call);
     reply.waitForFinished();
 =

diff --git a/solid/solid/backends/upower/upowermanager.cpp b/solid/solid/ba=
ckends/upower/upowermanager.cpp
index de2db75..bae234b 100644
--- a/solid/solid/backends/upower/upowermanager.cpp
+++ b/solid/solid/backends/upower/upowermanager.cpp
@@ -103,6 +103,9 @@ QStringList UPowerManager::devicesFromQuery(const QStri=
ng& parentUdi, Solid::Dev
     {
         foreach (const QString & udi, allDev)
         {
+            if (udi=3D=3DudiPrefix())
+                continue;
+
             UPowerDevice device(udi);
             if (device.queryDeviceInterface(type) && device.parentUdi() =
=3D=3D parentUdi)
                 result << udi;
@@ -114,6 +117,9 @@ QStringList UPowerManager::devicesFromQuery(const QStri=
ng& parentUdi, Solid::Dev
     {
         foreach (const QString & udi, allDev)
         {
+            if (udi=3D=3DudiPrefix())
+                continue;
+
             UPowerDevice device(udi);
             if (device.queryDeviceInterface(type))
                 result << udi;