diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2016-02-25 21:49:33 +0700 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2016-02-26 22:19:41 +0700 |
| commit | 14294b4b95311d44d7eabcfa836c6c54ee3612e4 (patch) | |
| tree | 2495135288fb4ac4d75c56b00d982bff36469f59 /tdeioslave/media/mediamanager | |
| parent | e8b6bcbd2c2a9beb65f0db7edd49f5da58b8fbae (diff) | |
| download | tdebase-14294b4b95311d44d7eabcfa836c6c54ee3612e4.tar.gz tdebase-14294b4b95311d44d7eabcfa836c6c54ee3612e4.zip | |
Added "default" mount option to TDE hardware manager. This resolves bug 2593.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 71bd29a534261d3ac976a4f2fb2c953172d165b5)
Diffstat (limited to 'tdeioslave/media/mediamanager')
| -rw-r--r-- | tdeioslave/media/mediamanager/halbackend.cpp | 4 | ||||
| -rw-r--r-- | tdeioslave/media/mediamanager/tdehardwarebackend.cpp | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp index 7829ab29e..80d443392 100644 --- a/tdeioslave/media/mediamanager/halbackend.cpp +++ b/tdeioslave/media/mediamanager/halbackend.cpp @@ -1039,9 +1039,9 @@ TQStringList HALBackend::mountoptions(const TQString &name) if (valids.contains("shortname")) { TQString svalue = config.readEntry("shortname", "lower").lower(); - if (svalue == "winnt") + 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"; 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"; } } |