[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kio/kio
From:       Patrick von Reth <patrick.vonreth () gmail ! com>
Date:       2011-01-13 19:18:36
Message-ID: 20110113191836.BC42AAC8B4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1214246 by vonreth:

Wen staring a .desktop file translate the %U/%f URL to a native Windows path if its a \
local file.\nThis makes sure that we can start non KDE software.\nStarting KDE \
software works as well.

 M  +3 -2      krun.cpp  


--- trunk/KDE/kdelibs/kio/kio/krun.cpp #1214245:1214246
@@ -67,6 +67,7 @@
 #include <QtCore/QTextIStream>
 #include <QtCore/QDate>
 #include <QtCore/QRegExp>
+#include <QDir>
 #include <kdesktopfile.h>
 #include <kmacroexpander.h>
 #include <kshell.h>
@@ -299,13 +300,13 @@
     switch (option) {
     case 'u':
         ret << ((url.isLocalFile() && url.fragment().isNull() && \
                url.encodedQuery().isNull()) ?
-                url.toLocalFile()  : url.url());
+                QDir::toNativeSeparators(url.toLocalFile())  : url.url());
         break;
     case 'd':
         ret << url.directory();
         break;
     case 'f':
-        ret << url.path();
+        ret << QDir::toNativeSeparators(url.toLocalFile());
         break;
     case 'n':
         ret << url.fileName();


[prev in list] [next in list] [prev in thread] [next in thread]