Bring back 'New Window' action in viewport context menu

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 8987d351f058d5b02a67c982ca51c937edc89ecf..db52e11be896eaef3ceeb4842325e7ae5f4b6f49 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,27 +19,40 @@
  *   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
+    // Check whether we are running as root
+    if (getuid() == 0) {
+        std::cout << "Executing Dolphin as root is not possible." << std::endl;
+        return EXIT_FAILURE;
+    }
+#endif
+

     QApplication app(argc, argv);
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     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();
 
 
     KCrash::initialize();