Fix for crash which was introduced by commit

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 46ad98bc91f941cd2d2b4cd072d1a44ed210ed55..bcd19d4d202a4d56b2b9cee325235a552f002557 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  *


@@ -20,63 +20,78 @@
 
 #include "dolphinapplication.h"
 
 
 #include "dolphinapplication.h"
 

-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
+#include "dolphinmainwindow.h"

 
 

-int main(int argc, char **argv)
+#include <k4aboutdata.h>
+#include <KCmdLineArgs>
+#include <KLocalizedString>
+#include <kmainwindow.h>
+#include <kdeversion.h>
+#include <KDebug>
+
+extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)

 {
 {

-    KAboutData about("dolphin", 0,
-                     ki18nc("@info", "Dolphin"),
-                     "0.9.0",
-                     ki18nc("@info", "File Manager"),
-                     KAboutData::License_GPL,
-                     ki18nc("@info:credit", "(C) 2006 Peter Penz"));
-    about.setHomepage("http://enzosworld.gmxhome.de");
-    about.setBugAddress("peter.penz@gmx.at");
+    K4AboutData about("dolphin", 0,
+                     ki18nc("@title", "Dolphin"),
+                     "4.60",
+                     ki18nc("@title", "File Manager"),
+                     K4AboutData::License_GPL,
+                     ki18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
+    about.setHomepage("http://dolphin.kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Emmanuel Pescosta"),
+                    ki18nc("@info:credit", "Maintainer (since 2014) and developer"),
+                    "emmanuelpescosta099@gmail.com");
+    about.addAuthor(ki18nc("@info:credit", "Frank Reininghaus"),
+                    ki18nc("@info:credit", "Maintainer (2012-2014) and developer"),
+                    "frank78ac@googlemail.com");

     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),

-                    ki18nc("@info:credit", "Maintainer and developer"),
-                    "peter.penz@gmx.at");
-    about.addAuthor(ki18nc("@info:credit", "Cvetoslav Ludmiloff"),
+                    ki18nc("@info:credit", "Maintainer and developer (2006-2012)"),
+                    "peter.penz19@gmail.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", "Aaron J. Seigo"),
+                    ki18nc("@info:credit", "Developer"),
+                    "aseigo@kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Rafael Fernández López"),
+                    ki18nc("@info:credit", "Developer"),
+                    "ereslibre@kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Kevin Ottens"),

                     ki18nc("@info:credit", "Developer"),
                     ki18nc("@info:credit", "Developer"),

-                    "ludmiloff@gmail.com");
-    about.addAuthor(ki18nc("@info:credit", "Stefan Monov"),
+                    "ervin@kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Holger Freyther"),

                     ki18nc("@info:credit", "Developer"),
                     ki18nc("@info:credit", "Developer"),

-                    "logixoul@gmail.com");
+                    "freyther@gmx.net");
+    about.addAuthor(ki18nc("@info:credit", "Max Blazejak"),
+                    ki18nc("@info:credit", "Developer"),
+                    "m43ksrocks@gmail.com");

     about.addAuthor(ki18nc("@info:credit", "Michael Austin"),
                     ki18nc("@info:credit", "Documentation"),
                     "tuxedup@users.sourceforge.net");
     about.addAuthor(ki18nc("@info:credit", "Michael Austin"),
                     ki18nc("@info:credit", "Documentation"),
                     "tuxedup@users.sourceforge.net");

-    about.addAuthor(ki18nc("@info:credit", "Orville Bennett"),
-                    ki18nc("@info:credit", "Documentation"), "obennett@hartford.edu");
-    about.addCredit(ki18nc("@info:credit", "Aaron J. Seigo"),
-                    ki18nc("@info:credit", "... for the great support and the amazing patches"));
-    about.addCredit(ki18nc("@info:credit", "Patrice Tremblay and Gregor Kalisnik"),
-                    ki18nc("@info:credit", "... for their patches"));
-    about.addCredit(ki18nc("@info:credit", "Ain, Itai, Ivan, Stephane, Patrice, Piotr and Stefano"),
-                    ki18nc("@info:credit", "... for their translations"));
+    // the .desktop file is not taken into account when launching manually, so
+    // set the icon precautionally:
+    about.setProgramIconName("system-file-manager");

 
     KCmdLineArgs::init(argc, argv, &about);
 
     KCmdLineOptions options;
 
     KCmdLineArgs::init(argc, argv, &about);
 
     KCmdLineOptions options;

+
+    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;
-#ifdef __GNUC__
-#warning TODO, SessionManagement
-#endif
-#if 0
-    if (false /* KDE4-TODO: app.isSessionRestored() */) {
-        int n = 1;
-        while (KMainWindow::canBeRestored(n)) {
-            Dolphin::mainWin().restore(n);
-            ++n;
+    {
+        DolphinApplication app;
+        if (app.isSessionRestored()) {
+            app.restoreSession();

         }
         }

-    } else {
-#endif
-        return app.exec();
+        app.exec(); // krazy:exclude=crashy

     }
     }

+
+    return 0;
+}