summaryrefslogtreecommitdiffstats
path: root/tdeioslave/media/mediamanager
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-11-21 01:50:07 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-11-21 01:50:07 +0100
commiteb091e7d3e771e8724d662f03baf95465cd41781 (patch)
treef3dae0d27f04f8c18b2920515dd13dc78dca6468 /tdeioslave/media/mediamanager
parent1c618af70de66f304481efe05b8ebcc0d5d8d4f6 (diff)
downloadtdebase-eb091e7d3e771e8724d662f03baf95465cd41781.tar.gz
tdebase-eb091e7d3e771e8724d662f03baf95465cd41781.zip
Fix allowing utf8 mount options in tdehw storage backend
Diffstat (limited to 'tdeioslave/media/mediamanager')
-rw-r--r--tdeioslave/media/mediamanager/tdehardwarebackend.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index b306a7bfe..9833cb591 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -900,7 +900,7 @@ TQStringList TDEBackend::mountoptions(const TQString &name)
//valids["quiet"] = false;
//valids["flush"] = false;
//valids["uid"] = false;
- valids["utf8"] = true;
+ //valids["utf8"] = false;
//valids["shortname"] = false;
//valids["locale"] = false;
valids["sync"] = true;
@@ -910,6 +910,7 @@ TQStringList TDEBackend::mountoptions(const TQString &name)
if ((sdevice->fileSystemName().endsWith("fat"))
|| (sdevice->fileSystemName().endsWith("dos"))
) {
+ valids["utf8"] = true;
valids["shortname"] = true;
}
if ((sdevice->fileSystemName() == "ext3")
@@ -917,18 +918,22 @@ TQStringList TDEBackend::mountoptions(const TQString &name)
) {
valids["data"] = true;
}
- if (sdevice->fileSystemName().startsWith("ext")) {
- valids.remove("utf8");
+ if (sdevice->fileSystemName() == "ntfs") {
+ valids["utf8"] = true;
}
if (sdevice->fileSystemName() == "ntfs-3g") {
valids["locale"] = true;
}
if (sdevice->fileSystemName() == "iso9660") {
+ valids["utf8"] = true;
valids.remove("ro");
valids.remove("quiet");
valids.remove("sync");
valids.remove("noatime");
}
+ if (sdevice->fileSystemName() == "jfs") {
+ valids["utf8"] = true;
+ }
TQString drive_udi = driveUDIFromDeviceUID(medium->id());