Merge remote-tracking branch 'origin/KDE/4.10'

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 42a3fe4320a69fd15f3ac90536d9084b56a647ed..e5ac4351c902e574534c2947eee3b5fad65356ae 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,23 +33,26 @@ KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),

-                     "2.0",
+                     "2.2.60",

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

-                     ki18nc("@info:credit", "(C) 2006-2012 Peter Penz"));
+                     ki18nc("@info:credit", "(C) 2006-2013 Peter Penz and Frank Reininghaus"));

     about.setHomepage("http://dolphin.kde.org");
     about.setHomepage("http://dolphin.kde.org");

-    about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
-                    ki18nc("@info:credit", "Maintainer and developer"),
-                    "peter.penz19@gmail.com");

     about.addAuthor(ki18nc("@info:credit", "Frank Reininghaus"),
     about.addAuthor(ki18nc("@info:credit", "Frank Reininghaus"),

-                    ki18nc("@info:credit", "Developer"),
+                    ki18nc("@info:credit", "Maintainer (since 2012) and developer"),

                     "frank78ac@googlemail.com");
                     "frank78ac@googlemail.com");

+    about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
+                    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", "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", "Emmanuel Pescosta"),
+                    ki18nc("@info:credit", "Developer"),
+                    "emmanuelpescosta099@gmail.com");

     about.addAuthor(ki18nc("@info:credit", "Aaron J. Seigo"),
                     ki18nc("@info:credit", "Developer"),
                     "aseigo@kde.org");
     about.addAuthor(ki18nc("@info:credit", "Aaron J. Seigo"),
                     ki18nc("@info:credit", "Developer"),
                     "aseigo@kde.org");


@@ -82,17 +85,13 @@ KDE_EXPORT int kdemain(int argc, char **argv)
     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 
     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 

-    // Use the native graphicssystem per default, as the scaling of pixmaps is just way too
-    // slow with the raster graphicssystem (see KPixmapModifier::scalePixmap()).
-    QApplication::setGraphicsSystem("native");
-
-    DolphinApplication app;
-    KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
-
-    if (app.isSessionRestored()) {
-        app.restoreSession();
+    {
+        DolphinApplication app;
+        if (app.isSessionRestored()) {
+            app.restoreSession();
+        }
+        app.exec(); // krazy:exclude=crashy

     }
     }

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

 
     return 0;
 }
 
     return 0;
 }