diff options
| author | Robert Xu <robxu9@gmail.com> | 2011-08-13 12:58:51 -0400 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2011-08-13 12:58:51 -0400 |
| commit | 46130378aea5fff80803409c2573e2ea31472cb9 (patch) | |
| tree | cb5da908105e6577da7676f84ba9c7fbaba4fb52 /opensuse/tdelibs/use-mediamanager.diff | |
| parent | 53f2819f9af035a38ca08df1ede9e6cd24aa79ef (diff) | |
| download | tde-packaging-46130378.tar.gz tde-packaging-46130378.zip | |
add dbus-1-tqt and libdbus-1-tqt-0; add unmodified tdelibs from kdelibs3
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 |