From dff837200eae3d2fdd7fbf8f39fbe41d5ecb2d8d Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Tue, 19 Dec 2023 21:20:24 +0300 Subject: Fix lvm volumes appearing as removable devices - remove obsolete/erroneous code meddling with GENHD_FL_MEDIA_CHANGE_NOTIFY - use /sys/block//removable rather than /sys/block//capabilities - deprecate TDEDiskDeviceStatus::Hotpluggable and use TDEDiskDeviceStatus::Removable for all removable devices - put some local utility function into anonymous namespace See https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/148 Signed-off-by: Alexander Golubev (cherry picked from commit 14573faf07515b472f86dff585bd8a14fa1f25d7) --- tdecore/tdehw/tdestoragedevice.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdecore/tdehw/tdestoragedevice.cpp') diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp index 08fb246e1..df5f90ab7 100644 --- a/tdecore/tdehw/tdestoragedevice.cpp +++ b/tdecore/tdehw/tdestoragedevice.cpp @@ -504,7 +504,7 @@ TQString TDEStorageDevice::friendlyName() { TQString label = diskLabel(); if (label.isNull()) { if (deviceSize() > 0) { - if (checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) { + if (checkDiskStatus(TDEDiskDeviceStatus::Removable)) { label = i18n("%1 Removable Device").arg(deviceFriendlySize()); } else { @@ -561,7 +561,7 @@ TQString TDEStorageDevice::friendlyDeviceType() { if (isDiskOfType(TDEDiskDeviceType::HDD)) { ret = i18n("Hard Disk Drive"); - if (checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) { + if (checkDiskStatus(TDEDiskDeviceStatus::Removable)) { ret = i18n("Removable Storage"); } if (isDiskOfType(TDEDiskDeviceType::CompactFlash)) { @@ -632,7 +632,7 @@ TQPixmap TDEStorageDevice::icon(TDEIcon::StdSizes size) { if (isDiskOfType(TDEDiskDeviceType::HDD)) { ret = DesktopIcon("drive-harddisk" + mountString, size); - if (checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) { + if (checkDiskStatus(TDEDiskDeviceStatus::Removable)) { ret = DesktopIcon("media-flash-usb" + mountString, size); } if (isDiskOfType(TDEDiskDeviceType::CompactFlash)) { -- cgit v1.2.1