Blame SOURCES/kde-runtime-solid-device-automounter.patch

d224f5
diff --git a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp
d224f5
index 42fbfae..80f6d28 100644
d224f5
--- a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp
d224f5
+++ b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp
d224f5
@@ -57,6 +57,7 @@ DeviceAutomounterKCM::DeviceAutomounterKCM(QWidget *parent, const QVariantList &
d224f5
 
d224f5
     m_devices = new DeviceModel(this);
d224f5
     deviceView->setModel(m_devices);
d224f5
+    deviceView->setEnabled(true);
d224f5
 
d224f5
     connect(automountOnLogin, SIGNAL(stateChanged(int)), this, SLOT(emitChanged()));
d224f5
     connect(automountOnPlugin, SIGNAL(stateChanged(int)), this, SLOT(emitChanged()));
d224f5
@@ -112,12 +113,10 @@ DeviceAutomounterKCM::enabledChanged()
d224f5
         automountOnLogin->setEnabled(false);
d224f5
         automountOnPlugin->setEnabled(false);
d224f5
         automountUnknownDevices->setEnabled(false);
d224f5
-        deviceView->setEnabled(false);
d224f5
     } else {
d224f5
         automountOnLogin->setEnabled(true);
d224f5
         automountOnPlugin->setEnabled(true);
d224f5
         automountUnknownDevices->setEnabled(true);
d224f5
-        deviceView->setEnabled(true);
d224f5
     }
d224f5
 }
d224f5
 
d224f5
diff --git a/solid-device-automounter/kcm/DeviceModel.cpp b/solid-device-automounter/kcm/DeviceModel.cpp
d224f5
index 9469cb6..7ab6eb4 100644
d224f5
--- a/solid-device-automounter/kcm/DeviceModel.cpp
d224f5
+++ b/solid-device-automounter/kcm/DeviceModel.cpp
d224f5
@@ -60,7 +60,8 @@ void
d224f5
 DeviceModel::deviceAttached(const QString &udi)
d224f5
 {
d224f5
     Solid::Device dev(udi);
d224f5
-    if (dev.is<Solid::StorageVolume>()) {
d224f5
+    Solid::StorageVolume *volume = dev.as<Solid::StorageVolume>();
d224f5
+    if (volume && !volume->isIgnored()) {
d224f5
         if (m_disconnected.contains(udi)) {
d224f5
             emit layoutAboutToBeChanged();
d224f5
             beginRemoveRows(index(1, 0), m_disconnected.indexOf(udi), m_disconnected.indexOf(udi));
d224f5
@@ -81,7 +82,6 @@ DeviceModel::deviceRemoved(const QString &udi)
d224f5
         m_attached.removeOne(udi);
d224f5
         endRemoveRows();
d224f5
         emit layoutChanged();
d224f5
-        addNewDevice(udi);
d224f5
     }
d224f5
 }
d224f5