--- kaffeine/kaffeineapp.cpp	2005-08-28 17:19:27.000000000 +0200
+++ kaffeine/kaffeineapp.cpp	2006-05-13 12:15:56.000000000 +0200
@@ -22,6 +22,7 @@
 #include <kurl.h>
 #include <kwin.h>
 #include <dcopref.h>
+#include <kio/netaccess.h>
 
 #include <qfile.h>
 #include <qtimer.h>
@@ -69,6 +70,26 @@
        urls.append(url);
      }
 
+  QString device = args->getOption("device");
+  if (device == "default")
+    device = QString::null;
+  else if (device.startsWith("media:/") || device.startsWith("system:/media/")) {
+    if (device.startsWith("system:/media/")) {
+      device = device.mid(14);
+      device = device.prepend("media:/");
+    }
+  }
+  KURL devicePath(device);
+  DCOPRef mediamanager("kded","mediamanager");
+  DCOPReply reply = mediamanager.call("properties(QString)",devicePath.path(-1).mid(1));
+  if (reply.isValid()) {
+    QStringList properties = reply;
+    device = properties[5];
+    kdDebug() << "DEVICE : " << device << endl;
+  }
+  else
+    device = QString::null;
+
   if (m_kaffeine)  /* still running */
   {
     kdDebug() << "KaffeineApp: Kaffeine is still running..." << endl;
@@ -92,23 +113,6 @@
   if (args->isSet("verbose"))
     engineParameters.append("verbose=\"True\"");
 
-  QString device = args->getOption("device");
-  if (device == "default")
-    device = QString::null;
-  else if (device.startsWith("media:/"))
-  {
-    KURL devicePath(device);
-    DCOPRef mediamanager("kded","mediamanager");
-    DCOPReply reply = mediamanager.call("properties(QString)",devicePath.path(-1).mid(1));
-    if (reply.isValid())
-    {
-      QStringList properties = reply;
-      device = properties[5];
-    }
-    else
-      device = QString::null;
-  }
-
   m_kaffeine = new Kaffeine(urls, engineParameters, device, args->isSet("play"), args->isSet("fullscreen"),
                             args->isSet("wizard"), 0, "kaffeine_mainview");
   m_kaffeine->show();