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 703161b1e83726fee543778b74bcfef9f6373606..0142e01ad65799f47512de5be9b9ae5d3dbcf90d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -69,12 +69,10 @@ int main(int argc, char **argv)
     /**
      * trigger initialisation of proper icon theme
      */
-#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 3, 0)
     KIconTheme::initTheme();
-#endif
 
     QApplication app(argc, argv);
-    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
+    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("org.kde.dolphin"), app.windowIcon()));
 
 #if HAVE_STYLE_MANAGER
     /**
@@ -91,8 +89,6 @@ int main(int argc, char **argv)
 #endif
 #endif
 
-    KCrash::initialize();
-
     KLocalizedString::setApplicationDomain(dolphinTranslationDomain);
 
     KAboutData aboutData(QStringLiteral("dolphin"),
@@ -100,7 +96,7 @@ int main(int argc, char **argv)
                          QStringLiteral(DOLPHIN_VERSION_STRING),
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
-                         i18nc("@info:credit", "(C) 2006-2022 The Dolphin Developers"));
+                         i18nc("@info:credit", "(C) 2006-2025 The Dolphin Developers"));
     aboutData.setHomepage(QStringLiteral("https://apps.kde.org/dolphin"));
     aboutData.addAuthor(i18nc("@info:credit", "Felix Ernst"),
                         i18nc("@info:credit", "Maintainer (since 2021) and developer"),
@@ -130,6 +126,7 @@ int main(int argc, char **argv)
     aboutData.addAuthor(i18nc("@info:credit", "Michael Austin"), i18nc("@info:credit", "Documentation"), QStringLiteral("tuxedup@users.sourceforge.net"));
 
     KAboutData::setApplicationData(aboutData);
+    KCrash::initialize();
 
     QCommandLineParser parser;
     aboutData.setupCommandLine(&parser);
@@ -165,6 +162,9 @@ int main(int argc, char **argv)
     }
 
     if (parser.isSet(QStringLiteral("daemon"))) {
+        // Prevent KApplicationLauncherJob from cause the application to quit on job finish.
+        QCoreApplication::setQuitLockEnabled(false);
+
         // Disable session management for the daemonized version
         // See https://bugs.kde.org/show_bug.cgi?id=417219
         auto disableSessionManagement = [](QSessionManager &sm) {