diff options
| author | Timothy Pearson <[email protected]> | 2014-11-27 02:17:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-11-27 02:17:02 -0600 |
| commit | 5ab19b14bd37985f904c0a1b42f5a6e36d6a3df0 (patch) | |
| tree | 30eb2b61dfdcdfdbdc4be4382a116289db73580d | |
| parent | 70a56d09e0a50feabd1f0ac53c7d51e1b5d8b828 (diff) | |
| download | tdebase-5ab19b14bd37985f904c0a1b42f5a6e36d6a3df0.tar.gz tdebase-5ab19b14bd37985f904c0a1b42f5a6e36d6a3df0.zip | |
Honor disk hidden flag when handling device insertion notifiers
This relates to Bug 2211
| -rw-r--r-- | kcontrol/hwmanager/devicepropsdlg.cpp | 3 | ||||
| -rw-r--r-- | tdeioslave/media/mediamanager/tdehardwarebackend.cpp | 6 |
2 files changed, 9 insertions, 0 deletions
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<br>"; } + if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden)) { + status_text += "Hidden<br>"; + } if (status_text == "<qt>") { status_text += "<i>Unavailable</i>"; } 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... |