allow that Dolphin can be started like 'dolphin .' for showing the current directory (patch submitted by Max Blazejak)

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

1 files changed, 8 insertions, 2 deletions

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index fc59eb08b..a3dc80fef 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -24,6 +24,7 @@
 #include <applicationadaptor.h>
 #include <kcmdlineargs.h>
 #include <kurl.h>
+#include <QDir>
 #include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :
@@ -89,9 +90,14 @@ int DolphinApplication::newInstance()
 
 int DolphinApplication::openWindow(const QString& url)
 {
+    QString dir = url;
+    if (dir == ".") {
+        dir = QDir::currentPath();
+    }
+
     DolphinMainWindow* win = createMainWindow();
-    if ((win->activeView() != 0) && !url.isEmpty()) {
-        win->activeView()->setUrl(KUrl(url));
+    if ((win->activeView() != 0) && !dir.isEmpty()) {
+        win->activeView()->setUrl(KUrl(dir));
     }
     win->show();
     return win->getId();