revert last patch ("fix issue that invoking 'dolphin .' does not work") and replace...

svn path=/trunk/KDE/kdebase/apps/; revision=665386

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index a3dc80fef6bfa051fcf9b1b454ee84af1b885967..85e27811a55ea1ed177114696835197b3a500176 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -24,7 +24,6 @@
 #include <applicationadaptor.h>
 #include <kcmdlineargs.h>
 #include <kurl.h>
-#include <QDir>
 #include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :
@@ -77,7 +76,7 @@ int DolphinApplication::newInstance()
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     if (args->count() > 0) {
         for (int i = 0; i < args->count(); ++i) {
-            openWindow(args->arg(i));
+            openWindow(args->url(i).path());
         }
     } else {
         openWindow(QString());
@@ -90,14 +89,9 @@ int DolphinApplication::newInstance()
 
 int DolphinApplication::openWindow(const QString& url)
 {
-    QString dir = url;
-    if (dir == ".") {
-        dir = QDir::currentPath();
-    }
-
     DolphinMainWindow* win = createMainWindow();
-    if ((win->activeView() != 0) && !dir.isEmpty()) {
-        win->activeView()->setUrl(KUrl(dir));
+    if ((win->activeView() != 0) && !url.isEmpty()) {
+        win->activeView()->setUrl(KUrl(url));
     }
     win->show();
     return win->getId();