From 5ab19b14bd37985f904c0a1b42f5a6e36d6a3df0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 27 Nov 2014 02:17:02 -0600 Subject: [PATCH] Honor disk hidden flag when handling device insertion notifiers This relates to Bug 2211 --- kcontrol/hwmanager/devicepropsdlg.cpp | 3 +++ tdeioslave/media/mediamanager/tdehardwarebackend.cpp | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index c6c8cde2c..12de8cea9 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/kcontrol/hwmanager/devicepropsdlg.cpp @@ -415,6 +415,9 @@ void DevicePropertiesDialog::populateDeviceInformation() { if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) { status_text += "Hotpluggable
"; } + if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden)) { + status_text += "Hidden
"; + } if (status_text == "") { status_text += "Unavailable"; } diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp index ce9d8fb9e..56eab25b2 100644 --- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp @@ -140,6 +140,12 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification) return; } + // Respect the device's hidden flag--we will still make the device available via the tdeioslave + // but we will not generate popups or other notifications on device insertion + if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden)) { + allowNotification = false; + } + // Add volume block devices if (sdevice->isDiskOfType(TDEDiskDeviceType::HDD)) { /* We only list volumes that...