- Fix crash found while investigating https://bugs.kde.org/show_bug.cgi?id=170927

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 395c5e1b83b6ce2291bfa4093152350463eda14a..0df406f926be666d797613dda5c019aab6bcc523 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,7 +24,6 @@
 
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
-#include <kicon.h>
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kdebug.h>
@@ -33,12 +32,11 @@ int main(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "0.9.5",
+                     "1.1.80",
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
-                     ki18nc("@info:credit", "(C) 2006, 2007 Peter Penz"));
-    about.setHomepage("http://enzosworld.gmxhome.de");
-    about.setBugAddress("http://bugs.kde.org");
+                     ki18nc("@info:credit", "(C) 2006-2008 Peter Penz"));
+    about.setHomepage("http://dolphin.kde.org");
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
                     ki18nc("@info:credit", "Maintainer and developer"),
                     "peter.penz@gmx.at");
@@ -63,6 +61,7 @@ int main(int argc, char **argv)
     about.addAuthor(ki18nc("@info:credit", "Michael Austin"),
                     ki18nc("@info:credit", "Documentation"),
                     "tuxedup@users.sourceforge.net");
+    about.setProgramIconName("system-file-manager");
 
     KCmdLineArgs::init(argc, argv, &about);
 
@@ -77,10 +76,9 @@ int main(int argc, char **argv)
     DolphinApplication app;
     // the .desktop file is not taken into account when launching manually, so
     // set the icon precautionally:
-    QApplication::setWindowIcon(KIcon("system-file-manager"));
     KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
 
-    if (false /*app.isSessionRestored()*/) {
+    if (app.isSessionRestored()) {
         int n = 1;
         while (KMainWindow::canBeRestored(n)) {
             const QString className = KXmlGuiWindow::classNameOfToplevel(n);
@@ -92,9 +90,8 @@ int main(int argc, char **argv)
             }
             ++n;
         }
-    } else {
-        app.exec();
     }
+    app.exec();
 
     return 0;
 }