diff options
author | Robert Xu <robxu9@gmail.com> | 2012-03-31 14:28:06 -0400 |
---|---|---|
committer | Robert Xu <robxu9@gmail.com> | 2012-03-31 14:28:06 -0400 |
commit | 59dd46ef985a719579132efa6a9aa49bfeeae112 (patch) | |
tree | 93d8c721ff263e67aaf59e364496862872ded8fb /opensuse/core/tdelibs.old/use-mediamanager.diff | |
parent | c141f0bc29b6e2eeda5ca08a043d26546a1427f9 (diff) | |
download | tde-packaging-59dd46ef985a719579132efa6a9aa49bfeeae112.tar.gz tde-packaging-59dd46ef985a719579132efa6a9aa49bfeeae112.zip |
better late than never, hm...
Diffstat (limited to 'opensuse/core/tdelibs.old/use-mediamanager.diff')
-rw-r--r-- | opensuse/core/tdelibs.old/use-mediamanager.diff | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/opensuse/core/tdelibs.old/use-mediamanager.diff b/opensuse/core/tdelibs.old/use-mediamanager.diff new file mode 100644 index 000000000..007c40bd0 --- /dev/null +++ b/opensuse/core/tdelibs.old/use-mediamanager.diff @@ -0,0 +1,44 @@ +Index: kioslave/file/file.cc +=================================================================== +--- kioslave/file/file.cc.orig ++++ kioslave/file/file.cc +@@ -69,6 +69,7 @@ + #include <qvaluelist.h> + #include <qregexp.h> + ++#include <dcopref.h> + #include <kshred.h> + #include <kdebug.h> + #include <kurl.h> +@@ -1609,6 +1610,31 @@ void FileProtocol::unmount( const QStrin + #endif /* HAVE_VOLMGT */ + + err = testLogFile( tmp ); ++ ++ if (err.contains("fstab") || err.contains("root")) { ++ QString olderr; ++ err = QString::null; ++ ++ DCOPRef d("kded", "mediamanager"); ++ d.setDCOPClient ( dcopClient() ); ++ DCOPReply reply = d.call("properties", _point); ++ QString udi; ++ ++ if ( reply.isValid() ) { ++ QStringList 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 |