Fix crash #1 when filtering items

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 752d309601940e6ba180bc4222e02672e8ec6276..1e5673a88e8efafeeb0bda6bdd4a75afe688da5a 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006 by Peter Penz <peter.penz19@gmail.com>             *

  *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -22,25 +22,31 @@
 
 #include "dolphinmainwindow.h"
 
 
 #include "dolphinmainwindow.h"
 

-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
+#include <KAboutData>
+#include <KCmdLineArgs>
+#include <KLocale>

 #include <kmainwindow.h>
 #include <kmainwindow.h>

-#include <kdebug.h>
+#include <KDebug>

 
 extern "C"
 KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
 
 extern "C"
 KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),

-                     "1.5",
+                     "1.99",

                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,

-                     ki18nc("@info:credit", "(C) 2006-2010 Peter Penz"));
+                     ki18nc("@info:credit", "(C) 2006-2011 Peter Penz"));

     about.setHomepage("http://dolphin.kde.org");
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
                     ki18nc("@info:credit", "Maintainer and developer"),
     about.setHomepage("http://dolphin.kde.org");
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
                     ki18nc("@info:credit", "Maintainer and developer"),

-                    "peter.penz@gmx.at");
+                    "peter.penz19@gmail.com");
+    about.addAuthor(ki18nc("@info:credit", "Frank Reininghaus"),
+                    ki18nc("@info:credit", "Developer"),
+                    "frank78ac@googlemail.com");
+    about.addAuthor(ki18nc("@info:credit", "Sebastian Trüg"),
+                    ki18nc("@info:credit", "Developer"),
+                    "trueg@kde.org"),

     about.addAuthor(ki18nc("@info:credit", "David Faure"),
                     ki18nc("@info:credit", "Developer"),
                     "faure@kde.org");
     about.addAuthor(ki18nc("@info:credit", "David Faure"),
                     ki18nc("@info:credit", "Developer"),
                     "faure@kde.org");


@@ -72,28 +78,15 @@ KDE_EXPORT int kdemain(int argc, char **argv)
 
     options.add("select", ki18nc("@info:shell", "The files and directories passed as arguments "
                                                 "will be selected."));
 
     options.add("select", ki18nc("@info:shell", "The files and directories passed as arguments "
                                                 "will be selected."));

+    options.add("split", ki18nc("@info:shell", "Dolphin will get started with a split view."));

     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 
     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 

-    if (!DolphinApplication::start()) {
-        return 0;
-    }
-

     DolphinApplication app;
     KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
 
     if (app.isSessionRestored()) {
     DolphinApplication app;
     KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
 
     if (app.isSessionRestored()) {

-        int n = 1;
-        while (KMainWindow::canBeRestored(n)) {
-            const QString className = KXmlGuiWindow::classNameOfToplevel(n);
-            if (className == QLatin1String("DolphinMainWindow")) {
-                DolphinMainWindow* win = app.createMainWindow();
-                win->restore(n);
-            } else {
-                kWarning() << "Unknown class " << className << " in session saved data!";
-            }
-            ++n;
-        }
+        app.restoreSession();

     }
     app.exec(); // krazy:exclude=crashy
 
     }
     app.exec(); // krazy:exclude=crashy