fixed some activation issues in combination with split views

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 9de7b609a4accd9c560eec9c0de94c6835283c81..98a6a87f1fd437be497437b4efc59b129831c4e7 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,37 +19,23 @@
  ***************************************************************************/
 
 #include "dolphinapplication.h"
  ***************************************************************************/
 
 #include "dolphinapplication.h"

-#include "dolphinmainwindow.h"
+

 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>

-#include <krun.h>
-#include <QDBusInterface>
-#include <QDBusReply>

 
 static KCmdLineOptions options[] =
 
 static KCmdLineOptions options[] =

-{
-    { "+[Url]", I18N_NOOP( "Document to open" ), 0 },
-    KCmdLineLastOption
-};
-
-void openWindow(DolphinApplication* app, const QString& url = QString())
-{
-    if (app != 0) {
-        app->openWindow(url);
-        return;
-    }
-
-    static QDBusInterface dbusIface("org.kde.dolphin", "/dolphin/Application", "",
-                                    QDBusConnection::connectToBus(QDBusConnection::SessionBus, "session_bus"));
-    QDBusReply<int> reply = dbusIface.call("openWindow", url);
-}
+    {
+        { "+[Url]", I18N_NOOP("Document to open"), 0
+        },
+        KCmdLineLastOption
+    };

 
 int main(int argc, char **argv)
 {
     KAboutData about("dolphin",
                      I18N_NOOP("Dolphin"),
 
 int main(int argc, char **argv)
 {
     KAboutData about("dolphin",
                      I18N_NOOP("Dolphin"),

-                     "0.8.0",
+                     "0.9.0",

                      I18N_NOOP("File Manager"),
                      KAboutData::License_GPL,
                      "(C) 2006 Peter Penz");
                      I18N_NOOP("File Manager"),
                      KAboutData::License_GPL,
                      "(C) 2006 Peter Penz");


@@ -67,34 +53,23 @@ int main(int argc, char **argv)
 
     KCmdLineArgs::init(argc, argv, &about);
     KCmdLineArgs::addCmdLineOptions(options);
 
     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
 #warning TODO, SessionManagement

+#endif

 #if 0
     if (false /* KDE4-TODO: app.isSessionRestored() */) {
         int n = 1;
 #if 0
     if (false /* KDE4-TODO: app.isSessionRestored() */) {
         int n = 1;

-        while (KMainWindow::canBeRestored(n)){
+        while (KMainWindow::canBeRestored(n)) {

             Dolphin::mainWin().restore(n);
             ++n;
         }
     } else {
 #endif
             Dolphin::mainWin().restore(n);
             ++n;
         }
     } else {
 #endif

-
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
-    if (args->count() > 0) {
-        for (int i = 0; i < args->count(); ++i) {
-            openWindow(app, args->arg(i));
-        }
-    }
-    else {
-        openWindow(app);
-    }
-    args->clear();
-    if (app != 0) {
-        return app->exec();
+        return app.exec();

     }
     }

-}