Use a QActionGroup and save 6 slots (and the duplication of the action names in the...

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index ebbc9a55249b3c0776ce1d7d1d7be74de199bc14..a7857272afb7b19f8f0678183a7a472491e86a0e 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,6 +24,7 @@
 
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
+#include <kicon.h>
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kdebug.h>
@@ -32,12 +33,11 @@ int main(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "0.9.5",
+                     "1.0.1",
                      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");
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
                     ki18nc("@info:credit", "Maintainer and developer"),
                     "peter.penz@gmx.at");
@@ -74,9 +74,12 @@ 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);