summaryrefslogtreecommitdiffstats
path: root/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2016-02-25 21:49:33 +0700
committerMichele Calgaro <[email protected]>2016-02-26 22:19:41 +0700
commit14294b4b95311d44d7eabcfa836c6c54ee3612e4 (patch)
tree2495135288fb4ac4d75c56b00d982bff36469f59 /tdeioslave/media/mediamanager/tdehardwarebackend.cpp
parente8b6bcbd2c2a9beb65f0db7edd49f5da58b8fbae (diff)
downloadtdebase-14294b4b95311d44d7eabcfa836c6c54ee3612e4.tar.gz
tdebase-14294b4b95311d44d7eabcfa836c6c54ee3612e4.zip
Added "default" mount option to TDE hardware manager. This resolves bug 2593.
Signed-off-by: Michele Calgaro <[email protected]> (cherry picked from commit 71bd29a534261d3ac976a4f2fb2c953172d165b5)
Diffstat (limited to 'tdeioslave/media/mediamanager/tdehardwarebackend.cpp')
-rw-r--r--tdeioslave/media/mediamanager/tdehardwarebackend.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index be07a4aa4..b6976b68a 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -1042,16 +1042,17 @@ TQStringList TDEBackend::mountoptions(const TQString &name)
if (valids.contains("shortname")) {
TQString svalue = config.readEntry("shortname", "lower").lower();
- if (svalue == "winnt") {
+ // If the user choose 'default', no shortname is added to the mount option list
+ if (svalue == "windows nt") {
result << "shortname=winnt";
}
- else if (svalue == "win95") {
+ else if (svalue == "windows 95") {
result << "shortname=win95";
}
else if (svalue == "mixed") {
result << "shortname=mixed";
}
- else {
+ else if (svalue == "lower"){
result << "shortname=lower";
}
}