From: Peter Penz <peter.penz19@gmail.com>
Date: Thu, 22 Mar 2007 16:39:43 +0000 (+0000)
Subject: KUniqueApplication::newInstance() already takes care about DBus (thanks to David... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/e74cc60fefbbbe5452c1fa069a59f2cac1ec4c1b

KUniqueApplication::newInstance() already takes care about DBus (thanks to David for the hint).

svn path=/trunk/KDE/kdebase/apps/; revision=645447
---

diff --git a/src/main.cpp b/src/main.cpp
index 47095c3a5..b0843a5e7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,13 +19,10 @@
  ***************************************************************************/
 
 #include "dolphinapplication.h"
-#include "dolphinmainwindow.h"
+
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <krun.h>
-#include <QDBusInterface>
-#include <QDBusReply>
 
 static KCmdLineOptions options[] =
 {
@@ -56,10 +53,11 @@ int main(int argc, char **argv)
     KCmdLineArgs::init(argc, argv, &about);
     KCmdLineArgs::addCmdLineOptions(options);
 
-    DolphinApplication* app = 0;
-    if (DolphinApplication::start()) {
-        app = new DolphinApplication();
+    if (!DolphinApplication::start()) {
+        return 0;
+    }
 
+    DolphinApplication app;
 #ifdef __GNUC__
 #warning TODO, SessionManagement
 #endif
@@ -72,11 +70,5 @@ int main(int argc, char **argv)
         }
     } else {
 #endif
-        return app->exec();
-    }
-
-    static QDBusInterface dbusIface("org.kde.dolphin", "/dolphin/Application", "",
-                                    QDBusConnection::connectToBus(QDBusConnection::SessionBus, "session_bus"));
-    dbusIface.call("openWindow");
-    return 0;
+    return app.exec();
 }