SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index b4ca2c6af74273a22d555e6bd02cc75d17387348..f51932913ce870bd78b85ba564bda305dc6f9977 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,6 +28,7 @@
 
 #include <KDBusService>
 #include <KAboutData>
 
 #include <KDBusService>
 #include <KAboutData>

+#include <KCrash>

 #include <QCommandLineParser>
 #include <QCommandLineOption>
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QCommandLineOption>
 #include <QApplication>


@@ -40,11 +41,15 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
 
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
 

+    KCrash::initialize();
+

     Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
     migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
     migrate.migrate();
 
     Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
     migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
     migrate.migrate();
 

+    KLocalizedString::setApplicationDomain("dolphin");
+

     KAboutData aboutData("dolphin", i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING),
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
     KAboutData aboutData("dolphin", i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING),
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,


@@ -113,8 +118,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 
     if (urls.isEmpty()) {
         // We need at least one URL to open Dolphin
 
     if (urls.isEmpty()) {
         // We need at least one URL to open Dolphin

-        const QUrl homeUrl(QUrl::fromLocalFile(GeneralSettings::homeUrl()));
-        urls.append(homeUrl);
+        urls.append(Dolphin::homeUrl());

     }
 
     const bool splitView = parser.isSet("split") || GeneralSettings::splitView();
     }
 
     const bool splitView = parser.isSet("split") || GeneralSettings::splitView();