[KStandardItemListWidget] Pass icon state to overlay painter

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index acba8daeddb1c1d9704c24affd416752e06b390f..a46b5e2d823dd5edded67467d32c11557a7d1aef 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,24 +19,42 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

+#include "dbusinterface.h"
+#include "dolphin_generalsettings.h"

 #include "dolphin_version.h"
 #include "dolphin_version.h"

+#include "dolphindebug.h"

 #include "dolphinmainwindow.h"
 #include "dolphinmainwindow.h"

-#include "dolphin_generalsettings.h"
-#include "dbusinterface.h"

 #include "global.h"
 #include "global.h"

-#include "dolphindebug.h"

 
 

-#include <KDBusService>

 #include <KAboutData>
 #include <KCrash>
 #include <KAboutData>
 #include <KCrash>

-#include <QCommandLineParser>
-#include <QCommandLineOption>
-#include <QApplication>
+#include <KDBusService>

 #include <KLocalizedString>
 #include <Kdelibs4ConfigMigrator>
 
 #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)
 {
 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.windowIcon()));
     QApplication app(argc, argv);
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));


@@ -95,8 +113,6 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     DBusInterface interface;
 
     QCommandLineParser parser;
     DBusInterface interface;
 
     QCommandLineParser parser;

-    parser.addVersionOption();
-    parser.addHelpOption();

     aboutData.setupCommandLine(&parser);
 
     // command line options
     aboutData.setupCommandLine(&parser);
 
     // command line options