Fix using of custom mountpoints with pmount in tdehwlib

This partially resolves Bug 2576

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c10124c965)

tdecore/tdehw/tdestoragedevice.cpp

@@ -953,10 +953,21 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOption
 				optionString.append(TQString(" -c %1").arg(mountOptions["locale"]));
 			}
 
+			TQString mountpoint;
+			if (mountOptions.contains("mountpoint")
+				&& !mountOptions["mountpoint"].isEmpty()
+				&& (mountOptions["mountpoint"] != "/media/")) {
+				mountpoint = mountOptions["mountpoint"];
+				mountpoint.replace("'", "'\\''");
+			}
+			else {
+				mountpoint = mediaName;
+			}
+
 			TQString passFileName = passwordFile.name();
 			passFileName.replace("'", "'\\''");
 
-			command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1").arg(passFileName).arg(optionString).arg(devNode).arg(mediaName);
+			command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1").arg(passFileName).arg(optionString).arg(devNode).arg(mountpoint);
 		}
 	}