[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/KDE/4.8] solid/solid/backends: Fix solid udisk/upower property queries
From:       Lukas Tinkl <lukas () kde ! org>
Date:       2012-07-17 10:50:43
Message-ID: 20120717105043.B555BA6094 () git ! kde ! org
[Download RAW message or body]

Git commit 764f7cdce7b3e54cbe8bdeccc20e85cd6a0b4aea by Lukas Tinkl.
Committed on 17/07/2012 at 12:48.
Pushed by lukas into branch 'KDE/4.8'.

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/764f7cdce7b3e54cbe8bdeccc20e85cd6a0b4aea

diff --git a/solid/solid/backends/udisks/udisksdevice.cpp \
b/solid/solid/backends/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() const
 {
     QDBusMessage call = QDBusMessage::createMethodCall(m_device->service(), \
                m_device->path(),
                                                        \
"org.freedesktop.DBus.Properties", "GetAll"); +    call << m_device->interface();
     QDBusPendingReply< QVariantMap > reply = \
QDBusConnection::systemBus().asyncCall(call);  reply.waitForFinished();
 
diff --git a/solid/solid/backends/udisks/udisksmanager.cpp \
b/solid/solid/backends/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 QString& \
parentUdi, Solid::Dev  {
         foreach (const QString &udi, deviceCache())
         {
+            if (udi==udiPrefix())
+                continue;
+
             UDisksDevice device(udi);
             if (device.queryDeviceInterface(type) && device.parentUdi() == \
parentUdi)  result << udi;
@@ -119,6 +122,9 @@ QStringList UDisksManager::devicesFromQuery(const QString& \
parentUdi, Solid::Dev  {
         foreach (const QString &udi, deviceCache())
         {
+            if (udi==udiPrefix())
+                continue;
+
             UDisksDevice device(udi);
             if (device.queryDeviceInterface(type))
                 result << udi;
diff --git a/solid/solid/backends/upower/upowerdevice.cpp \
b/solid/solid/backends/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() const
 {
     QDBusMessage call = QDBusMessage::createMethodCall(m_device.service(), \
                m_device.path(),
                                                        \
"org.freedesktop.DBus.Properties", "GetAll"); +    call << m_device.interface();
     QDBusPendingReply< QVariantMap > reply = \
QDBusConnection::systemBus().asyncCall(call);  reply.waitForFinished();
 
diff --git a/solid/solid/backends/upower/upowermanager.cpp \
b/solid/solid/backends/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 QString& \
parentUdi, Solid::Dev  {
         foreach (const QString & udi, allDev)
         {
+            if (udi==udiPrefix())
+                continue;
+
             UPowerDevice device(udi);
             if (device.queryDeviceInterface(type) && device.parentUdi() == \
parentUdi)  result << udi;
@@ -114,6 +117,9 @@ QStringList UPowerManager::devicesFromQuery(const QString& \
parentUdi, Solid::Dev  {
         foreach (const QString & udi, allDev)
         {
+            if (udi==udiPrefix())
+                continue;
+
             UPowerDevice device(udi);
             if (device.queryDeviceInterface(type))
                 result << udi;


[prev in list] [next in list] [prev in thread] [next in thread]