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 d48ef548e7eb7311e18e5139e00fe73d77dabb48..98a6a87f1fd437be497437b4efc59b129831c4e7 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,24 +19,23 @@
  ***************************************************************************/
 
 #include "dolphinapplication.h"
  ***************************************************************************/
 
 #include "dolphinapplication.h"

-#include "dolphinmainwindow.h"
-#include <kapplication.h>
+

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

-#include <krun.h>

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

-{
-    { "+[Url]", I18N_NOOP( "Document to open" ), 0 },
-    KCmdLineLastOption
-};
+    {
+        { "+[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");


@@ -55,32 +54,22 @@ int main(int argc, char **argv)
     KCmdLineArgs::init(argc, argv, &about);
     KCmdLineArgs::addCmdLineOptions(options);
 
     KCmdLineArgs::init(argc, argv, &about);
     KCmdLineArgs::addCmdLineOptions(options);
 

-    DolphinApplication app;
-
+    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) {
-                DolphinMainWindow *win = app.createMainWindow();
-                win->activeView()->setUrl(args->url(i));
-                win->show();
-            }
-        } else {
-            DolphinMainWindow* mainWin = app.createMainWindow();
-            mainWin->show();
-        }
-        args->clear();
-    
-    return app.exec();
-}
+        return app.exec();
+    }