You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
tde-packaging/redhat/tdebase/tdebase-14.0.0-tdehardwareb...

26 lines
924 B

--- tdebase/tdeioslave/media/mediamanager/tdehardwarebackend.cpp.new 2013-11-11 21:27:09.960234089 +0100
+++ tdebase/tdeioslave/media/mediamanager/tdehardwarebackend.cpp 2013-11-11 21:32:16.081679386 +0100
@@ -979,9 +979,21 @@
}
if (valids.contains("utf8")) {
- value = config.readBoolEntry("utf8", true);
+ // From "man mount": only some filesystems support 'iocharset' option.
+ if( (sdevice->fileSystemName() == "fat")
+ || (sdevice->fileSystemName() == "iso9660")
+ || (sdevice->fileSystemName() == "jfs")
+ || (sdevice->fileSystemName() == "msdos")
+ || (sdevice->fileSystemName() == "ntfs")
+ || (sdevice->fileSystemName() == "umsdos")
+ || (sdevice->fileSystemName() == "vfat")
+ ) {
+ value = config.readBoolEntry("utf8", true);
+ } else {
+ value = false;
+ }
tmp = TQString("utf8=%1").arg(value ? "true" : "false");
result << tmp;
}
if (valids.contains("shortname")) {