Assure that automatically expanding of a folder also works when the new folder has...

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index dfe291015ec5188ae31a548d75fca66112e8b0f2..0df406f926be666d797613dda5c019aab6bcc523 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,17 +26,17 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kmainwindow.h>
+#include <kdebug.h>
 
 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");
@@ -61,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);
 
@@ -73,9 +74,11 @@ int main(int argc, char **argv)
     }
 
     DolphinApplication app;
+    // the .desktop file is not taken into account when launching manually, so
+    // set the icon precautionally:
     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);
@@ -87,9 +90,8 @@ int main(int argc, char **argv)
             }
             ++n;
         }
-    } else {
-        app.exec();
     }
+    app.exec();
 
     return 0;
 }