X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/384ee037c2f58ca58f3274249f3b44d840af8ef9..e53ce0959feaeec8340dfeb92ca410018240b95a:/src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 225c48ed6..1bd88db58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,20 +26,21 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kmainwindow.h>
+#include <kdebug.h>
 
-int main(int argc, char **argv)
+extern "C"
+KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "0.9.5",
+                     "1.5.9",
                      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-2010 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");
+                    "peter.penz19@gmail.com");
     about.addAuthor(ki18nc("@info:credit", "David Faure"),
                     ki18nc("@info:credit", "Developer"),
                     "faure@kde.org");
@@ -48,7 +49,7 @@ int main(int argc, char **argv)
                     "aseigo@kde.org");
     about.addAuthor(ki18nc("@info:credit", "Rafael Fernández López"),
                     ki18nc("@info:credit", "Developer"),
-                    "ereslibre@gmail.com");
+                    "ereslibre@kde.org");
     about.addAuthor(ki18nc("@info:credit", "Kevin Ottens"),
                     ki18nc("@info:credit", "Developer"),
                     "ervin@kde.org");
@@ -61,10 +62,16 @@ 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);
 
     KCmdLineOptions options;
+
+    options.add("select", ki18nc("@info:shell", "The files and directories passed as arguments "
+                                                "will be selected."));
     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 
@@ -87,9 +94,8 @@ int main(int argc, char **argv)
             }
             ++n;
         }
-    } else {
-        app.exec();
     }
+    app.exec(); // krazy:exclude=crashy
 
     return 0;
 }