Fix the problem with the column views.

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index a54e8d4fc567b81d1ca610ad9eeeb92aecd1e53a..06dba88a2fc8b5bf77f1272f9658ef000b2f761d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,8 +24,10 @@
 
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
+#include <kicon.h>
 #include <klocale.h>
 #include <kmainwindow.h>
+#include <kdebug.h>
 
 int main(int argc, char **argv)
 {
@@ -36,7 +38,6 @@ int main(int argc, char **argv)
                      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");
@@ -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");
@@ -73,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);