Improved media manager dcop interface for mount/unmount/decrypt/undecrypt methods by returning more information.

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 24 insertions, 14 deletions

diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index 84910352d..c0e91c228 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -97,24 +97,34 @@ FstabBackend::~FstabBackend()
         KDirWatch::self()->removeFile(MTAB);
 }
 
-TQString FstabBackend::mount( const TQString &_udi )
+TQStringVariantMap FstabBackend::mount(const TQString &id)
 {
-    const Medium* medium = m_mediaList.findById(_udi);
-    if (!medium)
-        return i18n("No such medium: %1").arg(_udi);
-    TDEIO::Job* job = TDEIO::mount( false, 0, medium->deviceNode(), medium->mountPoint());
-    TDEIO::NetAccess::synchronousRun( job, 0 );
-    return TQString::null;
+		TQStringVariantMap result;
+    const Medium *medium = m_mediaList.findById(id);
+    if (!medium) {
+			result["errStr"] = i18n("No such medium: %1").arg(id);
+			result["result"] = false;
+			return result;
+		}
+    TDEIO::Job *job = TDEIO::mount(false, 0, medium->deviceNode(), medium->mountPoint());
+    TDEIO::NetAccess::synchronousRun(job, 0);
+		result["result"] = true;
+		return result;
 }
 
-TQString FstabBackend::unmount( const TQString &_udi )
+TQStringVariantMap FstabBackend::unmount(const TQString &id)
 {
-    const Medium* medium = m_mediaList.findById(_udi);
-    if (!medium)
-        return i18n("No such medium: %1").arg(_udi);
-    TDEIO::Job* job = TDEIO::unmount( medium->mountPoint(),  false);
-    TDEIO::NetAccess::synchronousRun( job, 0 );
-    return TQString::null;
+		TQStringVariantMap result;
+    const Medium *medium = m_mediaList.findById(id);
+    if (!medium) {
+			result["errStr"] = i18n("No such medium: %1").arg(id);
+			result["result"] = false;
+			return result;
+		}
+    TDEIO::Job *job = TDEIO::unmount(medium->mountPoint(), false);
+    TDEIO::NetAccess::synchronousRun(job, 0);
+		result["result"] = true;
+		return result;
 }
 
 void FstabBackend::slotDirty(const TQString &path)