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

List:       kde-commits
Subject:    [kdelibs/KDE/4.10] solid/solid/backends/udisks2: fixup product() and vendor() for block devices
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2012-11-08 15:37:40
Message-ID: 20121108153740.1DA86A6091 () git ! kde ! org
[Download RAW message or body]

Git commit e779fbde8a1ae6ff854f6849bc888cec187cd823 by Lukáš Tinkl.
Committed on 08/11/2012 at 16:35.
Pushed by lukas into branch 'KDE/4.10'.

fixup product() and vendor() for block devices

only Drives have those defined, so look there

M  +8    -7    solid/solid/backends/udisks2/udisksdevice.cpp

http://commits.kde.org/kdelibs/e779fbde8a1ae6ff854f6849bc888cec187cd823

diff --git a/solid/solid/backends/udisks2/udisksdevice.cpp \
b/solid/solid/backends/udisks2/udisksdevice.cpp index dd06ab7..bf0ab0c 100644
--- a/solid/solid/backends/udisks2/udisksdevice.cpp
+++ b/solid/solid/backends/udisks2/udisksdevice.cpp
@@ -618,20 +618,21 @@ QString Device::icon() const
 
 QString Device::product() const
 {
-    QString product = prop("Model").toString();
-
     if (!isDrive()) {
-        QString label = prop("IdLabel").toString();
-        if (!label.isEmpty()) {
-            product = label;
-        }
+        Device drive(drivePath());
+        return drive.prop("Model").toString();
     }
 
-    return product;
+    return prop("Model").toString();
 }
 
 QString Device::vendor() const
 {
+    if (!isDrive()) {
+        Device drive(drivePath());
+        return drive.prop("Vendor").toString();
+    }
+
     return prop("Vendor").toString();
 }
 


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