X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5c36011cf1f2fb65f59a9f3410240146c1cb0a44..dbc8874c00c35aaefacdd03f8aef9e4ac4e2be01:/src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 484ccab8e..a54e8d4fc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,15 +20,18 @@
 
 #include "dolphinapplication.h"
 
+#include "dolphinmainwindow.h"
+
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
+#include <kmainwindow.h>
 
 int main(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "0.9.1",
+                     "0.9.5",
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
                      ki18nc("@info:credit", "(C) 2006, 2007 Peter Penz"));
@@ -70,17 +73,23 @@ int main(int argc, char **argv)
     }
 
     DolphinApplication app;
-#ifdef __GNUC__
-#warning TODO, SessionManagement
-#endif
-#if 0
-    if (false /* KDE4-TODO: app.isSessionRestored() */) {
+    KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
+
+    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;
+}