Do not force -nolisten tcp

plfiorini · plfiorini · commit 6fdee0c9dba6 · 2015-08-20T21:06:48.000+02:00
Set the new ServerArguments setting with "-nolisten tcp" by default. Users that don't want it will simply override the setting. Closes #325
diff --git a/src/common/Configuration.h b/src/common/Configuration.h
@@ -54,7 +54,7 @@ namespace SDDM {
         // TODO: Not absolutely sure if everything belongs here. Xsessions, VT and probably some more seem universal
         Section(XDisplay,
             Entry(ServerPath,          QString,     _S("/usr/bin/X"),                           _S("X server path"));
-            Entry(ServerArguments,     QString,     _S(""),                                     _S("X server arguments"));
+            Entry(ServerArguments,     QString,     _S("-nolisten tcp"),                        _S("X server arguments"));
             Entry(XephyrPath,          QString,     _S("/usr/bin/Xephyr"),                      _S("Xephyr path"));
             Entry(XauthPath,           QString,     _S("/usr/bin/xauth"),                       _S("Xauth path"));
             Entry(SessionDir,          QString,     _S("/usr/share/xsessions"),                 _S("Session description directory"));
diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
@@ -156,7 +156,6 @@ namespace SDDM {
             // start display server
             QStringList args = mainConfig.XDisplay.ServerArguments.get().split(" ", QString::SkipEmptyParts);
             args << "-auth" << m_authPath
-                 << "-nolisten" << "tcp"
                  << "-background" << "none"
                  << "-noreset"
                  << "-displayfd" << QString::number(pipeFds[1])
