The apply button in the settings dialog now disables itself when settings are applied...

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index b9e8997a726ea2eb26902552959d90925f7b66be..e7f2771811bfe9e3952f1be93e64317d8e0a065c 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,11 +32,11 @@ int main(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "1.0.99",
+                     "1.2.80",
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
-                     ki18nc("@info:credit", "(C) 2006, 2007 Peter Penz"));
-    about.setHomepage("http://enzosworld.gmxhome.de");
+                     ki18nc("@info:credit", "(C) 2006-2009 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");
@@ -62,6 +61,9 @@ int main(int argc, char **argv)
     about.addAuthor(ki18nc("@info:credit", "Michael Austin"),
                     ki18nc("@info:credit", "Documentation"),
                     "tuxedup@users.sourceforge.net");
+    // 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);
 
@@ -74,9 +76,6 @@ 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 (app.isSessionRestored()) {
@@ -91,10 +90,8 @@ int main(int argc, char **argv)
             }
             ++n;
         }
-        app.exec();
-    } else {
-        app.exec();
     }
+    app.exec();
 
     return 0;
 }