From 96900dbce3aaa1fcac74a07a71482c5c6fcd3cab Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 2 Sep 2010 21:21:15 +0000
Subject: * Large set of SuSE patches to fix bugs and add functionality * kdemm
 is included but not used by knotify as it does not work out of the box

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1171141 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kioslave/file/file.cc | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'kioslave/file/file.cc')

diff --git a/kioslave/file/file.cc b/kioslave/file/file.cc
index 1fde27a81..441d03b98 100644
--- a/kioslave/file/file.cc
+++ b/kioslave/file/file.cc
@@ -69,6 +69,7 @@
 #include <tqvaluelist.h>
 #include <tqregexp.h>
 
+#include <dcopref.h>
 #include <kshred.h>
 #include <kdebug.h>
 #include <kurl.h>
@@ -1617,6 +1618,31 @@ void FileProtocol::unmount( const TQString& _point )
 #endif /* HAVE_VOLMGT */
 
     err = testLogFile( tmp );
+
+    if (err.contains("fstab") || err.contains("root")) {
+       TQString olderr;
+       err = TQString::null;
+
+       DCOPRef d("kded", "mediamanager");
+       d.setDCOPClient ( dcopClient() );
+       DCOPReply reply = d.call("properties", _point);
+       TQString udi;
+
+       if ( reply.isValid() ) {
+           TQStringList list = reply;
+           if (list.size())
+               udi = list[0];
+       }
+
+       if (!udi.isEmpty())
+           reply = d.call("unmount", udi);
+       
+       if (udi.isEmpty() || !reply.isValid())
+         err = olderr;
+       else if (reply.isValid())
+         reply.get(err);
+    }
+
     if ( err.isEmpty() )
 	finished();
     else
-- 
cgit v1.2.1