X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b45e2e92c568510bf26971ce26157ce2bf6a308d..3ba0f41c44e41da9606fff05cc21f4344d6f9b5f:/src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 12eac2211..dfe291015 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,9 +20,12 @@
 
 #include "dolphinapplication.h"
 
+#include "dolphinmainwindow.h"
+
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
+#include <kmainwindow.h>
 
 int main(int argc, char **argv)
 {
@@ -45,7 +48,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");
@@ -72,17 +75,21 @@ int main(int argc, char **argv)
     DolphinApplication app;
     KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
 
-#ifdef __GNUC__
-#warning TODO, SessionManagement
-#endif
-#if 0
-    if (false /* KDE4-TODO: app.isSessionRestored() */) {
+    if (false /*app.isSessionRestored()*/) {
         int n = 1;
         while (KMainWindow::canBeRestored(n)) {
-            Dolphin::mainWin().restore(n);
+            const QString className = KXmlGuiWindow::classNameOfToplevel(n);
+            if (className == QLatin1String("DolphinMainWindow")) {
+                DolphinMainWindow* win = app.createMainWindow();
+                win->restore(n);
+            } else {
+                kWarning() << "Unknown class " << className << " in session saved data!";
+            }
             ++n;
         }
     } else {
-#endif
-        return app.exec();
+        app.exec();
     }
+
+    return 0;
+}