From 14294b4b95311d44d7eabcfa836c6c54ee3612e4 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Thu, 25 Feb 2016 21:49:33 +0700
Subject: [PATCH] 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)
---
 tdeioslave/media/mediamanager/halbackend.cpp         | 4 ++--
 tdeioslave/media/mediamanager/tdehardwarebackend.cpp | 7 ++++---
 tdeioslave/media/tdecmodule/managermoduleview.ui     | 8 ++++++++
 3 files changed, 14 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";
 		}
 	}
diff --git a/tdeioslave/media/tdecmodule/managermoduleview.ui b/tdeioslave/media/tdecmodule/managermoduleview.ui
index 982da7d80..ef0ff5510 100644
--- a/tdeioslave/media/tdecmodule/managermoduleview.ui
+++ b/tdeioslave/media/tdecmodule/managermoduleview.ui
@@ -184,6 +184,9 @@ Some of the options are tristate. Leave them "undefined" to let TDE choose the b
                                     <property name="whatsThis" stdset="0">
                                         <string>&lt;h2&gt;Defines  the  behaviour  for  creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.&lt;/h2&gt;
 
+&lt;h3&gt;&lt;b&gt;Default&lt;/b&gt;&lt;/h3&gt;
+Do not force a short name option at all.
+
 &lt;h3&gt;&lt;b&gt;Lower&lt;/b&gt;&lt;/h3&gt;
 Force the short name to lower case upon display; store a long name when the short name is not all upper case.
 
@@ -244,6 +247,11 @@ Display the short name as is; store a long name when the short name is not all u
                                     </property>
                                 </widget>
                                 <widget class="TQComboBox" row="1" column="1">
+                                    <item>
+                                        <property name="text">
+                                            <string>Default</string>
+                                        </property>
+                                    </item>
                                     <item>
                                         <property name="text">
                                             <string>Lower</string>