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

List:       kde-commits
Subject:    KDE/kdelibs/solid/solid/backends/udisks
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2010-08-18 18:30:52
Message-ID: 20100818183052.2030EAC855 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1165282 by lukas:

optical discs (the media) provide always StorageVolume and StorageAccess


 M  +4 -2      udisksdevice.cpp  


--- trunk/KDE/kdelibs/solid/solid/backends/udisks/udisksdevice.cpp #1165281:1165282
@@ -147,9 +147,11 @@
         case Solid::DeviceInterface::Block:
             return m_device->property("DeviceBlockSize").toULongLong() > 0;
         case Solid::DeviceInterface::StorageVolume:
-            return m_device->property("DeviceIsPartition").toBool();
+            return m_device->property("DeviceIsPartition").toBool()
+                    || (m_device->property("DeviceIsOpticalDisc").toBool() && m_udi.endsWith(":media"));
         case Solid::DeviceInterface::StorageAccess:
-            return property("DeviceIsPartition").toBool() && property("PartitionNumber").toInt() > 0;
+            return (property("DeviceIsPartition").toBool() && property("PartitionNumber").toInt() > 0)
+                    || (m_device->property("DeviceIsOpticalDisc").toBool() && m_udi.endsWith(":media"));
         case Solid::DeviceInterface::StorageDrive:
             return !m_udi.endsWith(":media") && property("DeviceIsDrive").toBool();
         case Solid::DeviceInterface::OpticalDrive:
[prev in list] [next in list] [prev in thread] [next in thread]