revert fix for bug 167044 - although the crash is fixed the autoscroll does not work...

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 2e42cd9be6bfb50aff622aa2dca59b757b3d31d8..4333666a9c214cf5089abfcadaa11dd3041b6520 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,7 +24,6 @@
 
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>

-#include <kicon.h>

 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kdebug.h>


@@ -33,10 +32,10 @@ int main(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),

-                     "1.0.99",
+                     "1.1.1",

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

-                     ki18nc("@info:credit", "(C) 2006, 2007 Peter Penz"));
+                     ki18nc("@info:credit", "(C) 2006-2008 Peter Penz"));

     about.setHomepage("http://enzosworld.gmxhome.de");
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
                     ki18nc("@info:credit", "Maintainer and developer"),
     about.setHomepage("http://enzosworld.gmxhome.de");
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
                     ki18nc("@info:credit", "Maintainer and developer"),


@@ -62,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.addAuthor(ki18nc("@info:credit", "Michael Austin"),
                     ki18nc("@info:credit", "Documentation"),
                     "tuxedup@users.sourceforge.net");

+    about.setProgramIconName("system-file-manager");

 
     KCmdLineArgs::init(argc, argv, &about);
 
 
     KCmdLineArgs::init(argc, argv, &about);
 


@@ -76,7 +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:
     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()) {
     KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
 
     if (app.isSessionRestored()) {


@@ -91,9 +90,8 @@ int main(int argc, char **argv)
             }
             ++n;
         }
             }
             ++n;
         }

-    } else {
-        app.exec();

     }
     }

+    app.exec();

 
     return 0;
 }
 
     return 0;
 }