Fix some EBN issues

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index ed4cfff20d1f7bbed9af6a65cb3aa6610c18b9ff..e8d6c2d298d1bf37174b3108de0a6ddcca0ca18f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,19 +22,26 @@
 #include "dolphinmainwindow.h"
 #include "dolphin_generalsettings.h"
 
+#include <KDBusService>
 #include <KAboutData>
 #include <QCommandLineParser>
 #include <QCommandLineOption>
 #include <QApplication>
 #include <KLocalizedString>
-#include <KDebug>
+#include "dolphindebug.h"
+#include <kdelibs4configmigrator.h>
 
 extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
     QApplication app(argc, argv);
+    Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
+    migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
+    migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
+    migrate.migrate();
+
     app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
 
-    KAboutData aboutData("dolphin", i18n("Dolphin"), "4.60",
+    KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95",
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
                          i18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
@@ -75,6 +82,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 
     KAboutData::setApplicationData(aboutData);
 
+    KDBusService dolphinDBusService;
+
     QCommandLineParser parser;
     parser.addVersionOption();
     parser.addHelpOption();
@@ -96,9 +105,11 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     QList<QUrl> urls;
     const QStringList args = parser.positionalArguments();
     foreach (const QString& str,  args) {
-        const QUrl url(str);
+        const QUrl url = QUrl::fromUserInput(str, QString(), QUrl::AssumeLocalFile);
         if (url.isValid()) {
             urls.append(url);
+        } else {
+            qCWarning(DolphinDebug) << "Invalid URL: " << str;
         }
     }
 
@@ -141,7 +152,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         if (className == QLatin1String("DolphinMainWindow")) {
             m_mainWindow->restore(1);
         } else {
-            kWarning() << "Unknown class " << className << " in session saved data!";
+           qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
         }
     }