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 779690c1c5de280c9742f2d432e0a3c395156986..8661a3d1713cfa99107e99d9b67baf20412059ca 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,8 +12,8 @@
 #include "dolphindebug.h"
 #include "dolphinmainwindow.h"
 #include "global.h"
 #include "dolphindebug.h"
 #include "dolphinmainwindow.h"
 #include "global.h"

-#include "config-kuserfeedback.h"
-#ifdef HAVE_KUSERFEEDBACK
+#include "config-dolphin.h"
+#if HAVE_KUSERFEEDBACK

 #include "userfeedback/dolphinfeedbackprovider.h"
 #endif
 
 #include "userfeedback/dolphinfeedbackprovider.h"
 #endif
 


@@ -21,10 +21,13 @@
 #include <KCrash>
 #include <KDBusService>
 #include <KLocalizedString>
 #include <KCrash>
 #include <KDBusService>
 #include <KLocalizedString>

-#include <Kdelibs4ConfigMigrator>

 #include <KConfigGui>
 #include <KIO/PreviewJob>
 
 #include <KConfigGui>
 #include <KIO/PreviewJob>
 

+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <Kdelibs4ConfigMigrator>
+#endif
+

 #include <QApplication>
 #include <QCommandLineParser>
 #include <QDBusConnection>
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QDBusConnection>


@@ -44,10 +47,16 @@ int main(int argc, char **argv)
     // Prohibit using sudo or kdesu (but allow using the root user directly)
     if (getuid() == 0) {
         if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
     // Prohibit using sudo or kdesu (but allow using the root user directly)
     if (getuid() == 0) {
         if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {

-            std::cout << "Executing Dolphin with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
+            std::cout << "Running Dolphin with sudo can cause bugs and expose you to security vulnerabilities. "
+                         "Instead use Dolphin normally and you will be prompted for elevated privileges when "
+                         "performing file operations that require them."
+                      << std::endl;

             return EXIT_FAILURE;
         } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
             return EXIT_FAILURE;
         } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {

-            std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+            std::cout << "Running Dolphin with kdesu can cause bugs and expose you to security vulnerabilities. "
+                         "Instead use Dolphin normally and you will be prompted for elevated privileges when "
+                         "performing file operations that require them."
+                      << std::endl;

             return EXIT_FAILURE;
         }
     }
             return EXIT_FAILURE;
         }
     }


@@ -56,9 +65,10 @@ int main(int argc, char **argv)
     /**
      * enable high dpi support
      */
     /**
      * enable high dpi support
      */

+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)

     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);

-
+#endif

     QApplication app(argc, argv);
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
 
     QApplication app(argc, argv);
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
 


@@ -66,10 +76,12 @@ int main(int argc, char **argv)
 
     KCrash::initialize();
 
 
     KCrash::initialize();
 

+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)

     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();

+#endif

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


@@ -148,7 +160,11 @@ int main(int argc, char **argv)
         QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
         QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
 
         QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
         QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
 

+#ifdef FLATPAK
+        KDBusService dolphinDBusService(KDBusService::NoExitOnFailure);
+#else

         KDBusService dolphinDBusService;
         KDBusService dolphinDBusService;

+#endif

         DBusInterface interface;
         interface.setAsDaemon();
         return app.exec();
         DBusInterface interface;
         interface.setAsDaemon();
         return app.exec();


@@ -222,7 +238,7 @@ int main(int argc, char **argv)
         }
     }
 
         }
     }
 

-#ifdef HAVE_KUSERFEEDBACK
+#if HAVE_KUSERFEEDBACK

     auto feedbackProvider = DolphinFeedbackProvider::instance();
     Q_UNUSED(feedbackProvider)
 #endif
     auto feedbackProvider = DolphinFeedbackProvider::instance();
     Q_UNUSED(feedbackProvider)
 #endif