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

List:       kde-commits
Subject:    [kdelibs/KDE/4.10] solid/solid/backends/udisks2: display correct action icon in device notifier
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2012-11-08 1:57:29
Message-ID: 20121108015729.6A558A6091 () git ! kde ! org
[Download RAW message or body]

Git commit a8ac8cc9727aa71891a75281749061e1c3a23edf by Lukáš Tinkl.
Committed on 08/11/2012 at 02:54.
Pushed by lukas into branch 'KDE/4.10'.

display correct action icon in device notifier

by checking the accessibility for the correct path

M  +1    -7    solid/solid/backends/udisks2/udisksdevice.cpp
M  +3    -7    solid/solid/backends/udisks2/udisksstorageaccess.cpp

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

diff --git a/solid/solid/backends/udisks2/udisksdevice.cpp \
b/solid/solid/backends/udisks2/udisksdevice.cpp index df34b77..dd06ab7 100644
--- a/solid/solid/backends/udisks2/udisksdevice.cpp
+++ b/solid/solid/backends/udisks2/udisksdevice.cpp
@@ -644,12 +644,6 @@ QString Device::parentUdi() const
 {
     QString parent;
 
-    if (isEncryptedContainer()) {
-        QString path = prop("CryptoBackingDevice").value<QDBusObjectPath>().path();
-        if (!path.isEmpty() && path != "/")
-            parent = path;
-    }
-
     if (propertyExists("Drive"))  // block
         parent = prop("Drive").value<QDBusObjectPath>().path();
     else if (propertyExists("Table"))  // partition
@@ -673,7 +667,7 @@ void Device::checkCache(const QString &key) const
     if (reply.isValid()) {
         m_cache.insert(key, reply);
     } else {
-        qDebug() << "got invalid reply for cache:" << key;
+        //qDebug() << "got invalid reply for cache:" << key;
     }
 }
 
diff --git a/solid/solid/backends/udisks2/udisksstorageaccess.cpp \
b/solid/solid/backends/udisks2/udisksstorageaccess.cpp index 5852536..6958459 100644
--- a/solid/solid/backends/udisks2/udisksstorageaccess.cpp
+++ b/solid/solid/backends/udisks2/udisksstorageaccess.cpp
@@ -100,7 +100,7 @@ QString StorageAccess::filePath() const
 
 bool StorageAccess::isIgnored() const
 {
-    return m_device->prop("HintIgnore").toBool(); // FIXME tune
+    return m_device->prop("HintIgnore").toBool();
 }
 
 bool StorageAccess::setup()
@@ -136,16 +136,12 @@ void StorageAccess::checkAccessibility()
     const bool old_isAccessible = m_isAccessible;
     updateCache();
 
-    //qDebug() << QString("CHECKING ACCESSIBILITY, device %1 was mounted: \
                %2").arg(m_device->udi()).arg(old_isAccessible);
-    //qDebug() << "CLEARTEXT path:" << clearTextPath();
-
     if (old_isAccessible != m_isAccessible) {
-        //qDebug() << "\tnow is mounted:" << m_isAccessible;
-        Q_EMIT accessibilityChanged(m_isAccessible, isLuksDevice() ? clearTextPath() \
: m_device->udi()); +        Q_EMIT accessibilityChanged(m_isAccessible, \
m_device->udi());  }
 }
 
-void StorageAccess::slotDBusReply( const QDBusMessage & reply )
+void StorageAccess::slotDBusReply( const QDBusMessage & /*reply*/ )
 {
     const QString ctPath = clearTextPath();
     if (m_setupInProgress)


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