summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-06-01 22:53:06 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-07-07 23:44:45 +0900
commit95ee524a5494d10d5dc3dee8658f5cabc406590f (patch)
treebecb73b3f612ac62c159c1ce0812a85ef6f57ddd
parent2cc912450d45be2762df8b4fb9d402811f4473e5 (diff)
downloadtdelibs-95ee524a5494d10d5dc3dee8658f5cabc406590f.tar.gz
tdelibs-95ee524a5494d10d5dc3dee8658f5cabc406590f.zip
Updated to latest mediamanager dcop interface.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--tdeioslave/file/file.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/tdeioslave/file/file.cc b/tdeioslave/file/file.cc
index 45c482620..c445230e6 100644
--- a/tdeioslave/file/file.cc
+++ b/tdeioslave/file/file.cc
@@ -1644,11 +1644,16 @@ void FileProtocol::unmount( const TQString& _point )
if (!udi.isEmpty())
reply = d.call("unmount", udi);
-
+
if (udi.isEmpty() || !reply.isValid())
- err = olderr;
- else if (reply.isValid())
- reply.get(err);
+ err = olderr;
+ else if (reply.isValid()) {
+ TQStringVariantMap unmountResult;
+ reply.get(unmountResult);
+ if (!unmountResult.contains("result") || !unmountResult["result"].toBool()) {
+ err = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : i18n("Unknown unmount error.");
+ }
+ }
}
if ( err.isEmpty() )