summaryrefslogtreecommitdiffstats
path: root/kioslave/media/mediamanager
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-10-13 21:41:23 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-10-13 21:41:23 -0500
commit6fb5669626c58d79beb6e9db048d2783cc2198c5 (patch)
treeb7a93ff27771e812961941576f768e4476babca3 /kioslave/media/mediamanager
parent1f79e5310340b895b15ad7594fc5d7afb5a69418 (diff)
downloadtdebase-6fb5669626c58d79beb6e9db048d2783cc2198c5.tar.gz
tdebase-6fb5669626c58d79beb6e9db048d2783cc2198c5.zip
Fix blank optical media labeling
Diffstat (limited to 'kioslave/media/mediamanager')
-rw-r--r--kioslave/media/mediamanager/tdehardwarebackend.cpp17
1 files changed, 12 insertions, 5 deletions
diff --git a/kioslave/media/mediamanager/tdehardwarebackend.cpp b/kioslave/media/mediamanager/tdehardwarebackend.cpp
index 892ac44d0..f318c5786 100644
--- a/kioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/kioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -413,7 +413,6 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (diskLabel.isNull()) {
diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
}
- medium->setLabel(diskLabel);
TQString mimeType;
@@ -437,31 +436,35 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::CDROM)) {
mimeType = "media/cdrom" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
- mimeType = "media/blankcd" + MOUNT_SUFFIX;
+ mimeType = "media/blankcd";
medium->unmountableState("");
+ diskLabel = i18n("Blank CDROM");
}
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::CDRW)) {
mimeType = "media/cdwriter" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
- mimeType = "media/blankcd" + MOUNT_SUFFIX;
+ mimeType = "media/blankcd";
medium->unmountableState("");
+ diskLabel = i18n("Blank CDRW");
}
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDROM)) {
mimeType = "media/dvd" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
- mimeType = "media/blankdvd" + MOUNT_SUFFIX;
+ mimeType = "media/blankdvd";
medium->unmountableState("");
+ diskLabel = i18n("Blank DVDROM");
}
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRAM)) {
mimeType = "media/dvd" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
- mimeType = "media/blankdvd" + MOUNT_SUFFIX;
+ mimeType = "media/blankdvd";
medium->unmountableState("");
+ diskLabel = i18n("Blank DVDRAM");
}
}
@@ -470,6 +473,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd" + MOUNT_SUFFIX;
medium->unmountableState("");
+ diskLabel = i18n("Blank DVDRW");
}
}
@@ -478,6 +482,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbd" + MOUNT_SUFFIX;
medium->unmountableState("");
+ diskLabel = i18n("Blank BDROM");
}
}
@@ -486,6 +491,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbd" + MOUNT_SUFFIX;
medium->unmountableState("");
+ diskLabel = i18n("Blank BDRW");
}
}
@@ -555,6 +561,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
}
+ medium->setLabel(diskLabel);
medium->setMimeType(mimeType);
}