[KStandardItemListWidget] Round to icon size before applying scaling

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 8987d351f058d5b02a67c982ca51c937edc89ecf..a46b5e2d823dd5edded67467d32c11557a7d1aef 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,27 +19,45 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
+#include "dbusinterface.h"
+#include "dolphin_generalsettings.h"
 #include "dolphin_version.h"
+#include "dolphindebug.h"
 #include "dolphinmainwindow.h"
-#include "dolphin_generalsettings.h"
-#include "dbusinterface.h"
 #include "global.h"
-#include "dolphindebug.h"
 
-#include <KDBusService>
 #include <KAboutData>
 #include <KCrash>
-#include <QCommandLineParser>
-#include <QCommandLineOption>
-#include <QApplication>
+#include <KDBusService>
 #include <KLocalizedString>
 #include <Kdelibs4ConfigMigrator>
 
+#include <QApplication>
+#include <QCommandLineParser>
+
+#ifndef Q_OS_WIN
+#include <unistd.h>
+#endif
+#include <iostream>
+
 extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
+#ifndef Q_OS_WIN
+    // 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;
+            return EXIT_FAILURE;
+        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
+            std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+            return EXIT_FAILURE;
+        }
+    }
+#endif
+
     QApplication app(argc, argv);
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
-    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager")));
+    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
 
     KCrash::initialize();
 
@@ -95,8 +113,6 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     DBusInterface interface;
 
     QCommandLineParser parser;
-    parser.addVersionOption();
-    parser.addHelpOption();
     aboutData.setupCommandLine(&parser);
 
     // command line options