diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-13 12:21:22 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-13 12:21:22 -0500 |
| commit | f65bcb8326e06816d7dc49e58bda120182dbbcd6 (patch) | |
| tree | 4e7fef001fc523929450778d10c86b41e6e32eda /opensuse/tdelibs/use-mediamanager.diff | |
| parent | 131df957b41b4683571b1e36e6fed9d614d32356 (diff) | |
| parent | fa41f32b69994ecd75b7359fa2df08ea5a3480ab (diff) | |
| download | tde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.tar.gz tde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'opensuse/tdelibs/use-mediamanager.diff')
| -rw-r--r-- | opensuse/tdelibs/use-mediamanager.diff | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/opensuse/tdelibs/use-mediamanager.diff b/opensuse/tdelibs/use-mediamanager.diff new file mode 100644 index 000000000..007c40bd0 --- /dev/null +++ b/opensuse/tdelibs/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 |