From 21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 Mon Sep 17 00:00:00 2001
From: Robert Xu <robxu9@gmail.com>
Date: Thu, 10 Nov 2011 18:04:39 -0500
Subject: initial commit to suse branch: eclipse integration

---
 opensuse/tdelibs/use-mediamanager.diff | 44 ----------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 opensuse/tdelibs/use-mediamanager.diff

(limited to 'opensuse/tdelibs/use-mediamanager.diff')

diff --git a/opensuse/tdelibs/use-mediamanager.diff b/opensuse/tdelibs/use-mediamanager.diff
deleted file mode 100644
index 007c40bd0..000000000
--- a/opensuse/tdelibs/use-mediamanager.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-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
-- 
cgit v1.2.1