This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 11684ffd182ccb0b9106ce264696617df0b6b96e Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 2 18:55:53 2015 +0100 onmainwindow.cpp: do NOT reformat. Reverts most of the previous commit because it breaks code logic. This half-reverts commit 468b0de22e9cf26a7768b16398d7b4a92c477fc5. --- debian/changelog | 2 + src/onmainwindow.cpp | 164 +++++++++++++++++++++++++------------------------- 2 files changed, 84 insertions(+), 82 deletions(-) diff --git a/debian/changelog b/debian/changelog index a4cd4d3..5b82c2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low - onmainwindow.cpp: include sshd PID file path option in quotes to support whitespaces within the var directory path on Windows. Add comment to revisit this later on non-Windows-platforms, too. Fixes: #916. + - onmainwindow.cpp: do NOT reformat. Reverts most of the previous commit + because it breaks code logic. [ Oleksandr Shneyder ] * New upstream release (4.0.5.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 4e94f9a..60b37c6 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -2606,7 +2606,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) sessIcon = wrap_legacy_resource_URIs (st->setting()->value (sid+"/icon", - (QVariant) ":/img/icons/128x128/x2gosession.png" + (QVariant) ":/img/icons/128x128/x2gosession.png" ).toString ()); sessIcon = expandHome(sessIcon); @@ -3419,7 +3419,7 @@ bool ONMainWindow::startSession ( const QString& sid ) false).toBool ()); QString prtype = (st->setting ()->value (sid + "/sshproxytype", - "SSH").toString ()); + "SSH").toString ()); if (prtype.toLower () == "http") { proxyType = SshMasterConnection::PROXYHTTP; } @@ -3441,7 +3441,7 @@ bool ONMainWindow::startSession ( const QString& sid ) 22).toInt ()); proxyAutologin = (st->setting ()->value (sid + "/sshproxyautologin", - false).toBool ()); + false).toBool ()); proxyKrbLogin = (st->setting ()->value (sid + "/sshproxykrblogin", false).toBool ()); @@ -5598,10 +5598,10 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) #ifdef Q_OS_DARWIN if (modMapTimer) { - disconnect (modMapTimer, SIGNAL (timeout ()), this, SLOT (slotSetModMap ())); - modMapTimer->stop (); - delete (modMapTimer); - modMapTimer = 0; + disconnect (modMapTimer, SIGNAL (timeout ()), this, SLOT (slotSetModMap ())); + modMapTimer->stop (); + delete (modMapTimer); + modMapTimer = 0; } kbMap = QString (); //fixes bug, when mainwindow inputs not accepting focus under mac @@ -6468,9 +6468,9 @@ void ONMainWindow::runCommand() void ONMainWindow::runApplication(QString exec) { QString cmd = "PULSE_CLIENTCONFIG=\"${HOME}/.x2go/C-" - + resumingSession.sessionId+"/.pulse-client.conf\" DISPLAY=:" - + resumingSession.display - + " setsid " + exec + " 1> /dev/null 2>/dev/null & exit"; + + resumingSession.sessionId+"/.pulse-client.conf\" DISPLAY=:" + + resumingSession.display + + " setsid " + exec + " 1> /dev/null 2>/dev/null & exit"; sshConnection->executeCommand (cmd); } @@ -7627,7 +7627,7 @@ void ONMainWindow::exportDirs ( QString exports,bool removable ) // Key creation failure or the like. if (dr.key.isEmpty ()) { - return; + return; } QString passwd; @@ -8512,53 +8512,53 @@ void ONMainWindow::slotScDaemonError (QProcess::ProcessError error) { QString informative_text; switch (error) { - case QProcess::FailedToStart: { - main_text += tr ("failed to start."); - informative_text = tr ("Check whether the package providing \"scdaemon\" is installed.\n" - "The current search path is: "); + case QProcess::FailedToStart: { + main_text += tr ("failed to start."); + informative_text = tr ("Check whether the package providing \"scdaemon\" is installed.\n" + "The current search path is: "); - QProcessEnvironment tmp_env = QProcessEnvironment::systemEnvironment (); + QProcessEnvironment tmp_env = QProcessEnvironment::systemEnvironment (); - if (!(scDaemon->processEnvironment ().isEmpty ())) { - tmp_env = scDaemon->processEnvironment (); - } + if (!(scDaemon->processEnvironment ().isEmpty ())) { + tmp_env = scDaemon->processEnvironment (); + } - QString path_val = tmp_env.value ("PATH", "unknown"); + QString path_val = tmp_env.value ("PATH", "unknown"); - /* Add a newline every 100 characters. */ - for (std::size_t i = 100; i < static_cast<std::size_t> (path_val.size ()); i += 100) { - path_val.insert (i, "\n"); - } + /* Add a newline every 100 characters. */ + for (std::size_t i = 100; i < static_cast<std::size_t> (path_val.size ()); i += 100) { + path_val.insert (i, "\n"); + } - informative_text += path_val; - break; - } - case QProcess::Crashed: { - /* This means the process exited with a non-zero exit code. - * It didn't really crash at all. Everything is fine. - * Just restart it. */ - return; - } - case QProcess::Timedout: { - main_text += tr ("didn't start yet."); - informative_text = tr ("This error shouldn't come up."); - break; - } - case QProcess::WriteError: { - main_text += tr ("didn't accept a write operation."); - informative_text = tr ("It is probably not running correctly or crashed in-between."); - break; - } - case QProcess::ReadError: { - main_text = tr ("Unable to read from scdaemon."); - informative_text = tr ("It is probably not running correctly or crashed in-between."); - break; - } - case QProcess::UnknownError: { - } - default: { - main_text += tr ("experienced an unknown error."); - } + informative_text += path_val; + break; + } + case QProcess::Crashed: { + /* This means the process exited with a non-zero exit code. + * It didn't really crash at all. Everything is fine. + * Just restart it. */ + return; + } + case QProcess::Timedout: { + main_text += tr ("didn't start yet."); + informative_text = tr ("This error shouldn't come up."); + break; + } + case QProcess::WriteError: { + main_text += tr ("didn't accept a write operation."); + informative_text = tr ("It is probably not running correctly or crashed in-between."); + break; + } + case QProcess::ReadError: { + main_text = tr ("Unable to read from scdaemon."); + informative_text = tr ("It is probably not running correctly or crashed in-between."); + break; + } + case QProcess::UnknownError: { + } + default: { + main_text += tr ("experienced an unknown error."); + } } if (!informative_text.isEmpty ()) { @@ -10056,15 +10056,15 @@ void ONMainWindow::generateEtcFiles() #endif QTextStream out ( &file ); out<<"StrictModes no\n"<< - "UsePrivilegeSeparation no\n"<< - "PidFile \"" + varDir + "/sshd.pid\"\n" << + "UsePrivilegeSeparation no\n"<< + "PidFile \"" + varDir + "/sshd.pid\"\n" << #ifdef Q_OS_WIN - "Subsystem shell "<< wapiShortFileName ( appDir) +"/sh"+"\n"<< - "Subsystem sftp "<< wapiShortFileName ( appDir) +"/sftp-server"+"\n"<< - "AuthorizedKeysFile \""<<authKeyPath<<"\""; + "Subsystem shell "<< wapiShortFileName ( appDir) +"/sh"+"\n"<< + "Subsystem sftp "<< wapiShortFileName ( appDir) +"/sftp-server"+"\n"<< + "AuthorizedKeysFile \""<<authKeyPath<<"\""; #else - /* This may need some sanitization, i.e., appDir could potentially include whitespace. */ - "Subsystem sftp " + "Subsystem sftp " + /* This may need some sanitization, i.e., appDir could potentially include whitespace. */ <<appDir<<"/sftp-server\n"; #endif file.close(); @@ -10108,7 +10108,7 @@ bool ONMainWindow::startSshd() // Should also automatically create keys if Remote Login is enabled // under Sharing in System Preferences. if (!isServerRunning (clientSshPort.toInt ())) { - clientSshPort = "7022"; + clientSshPort = "7022"; } #endif // defined (Q_OS_DARWIN) #endif // defined (Q_OS_LINUX) @@ -10908,10 +10908,10 @@ void ONMainWindow::processCfgLine ( QString line ) { config.useproxy = true; if (lst[1].toLower () == "true") { - config.useproxy = true; + config.useproxy = true; } else { - config.useproxy = false; + config.useproxy = false; } return; } @@ -11643,7 +11643,7 @@ void ONMainWindow::printSshDError_startupFailure() "If you see this message, please report a bug on:\n" "<center><a href=\"https://wiki.x2go.org/doku.php/wiki:bugs\">" - "https://wiki.x2go.org/doku.php/wiki:bugs" + "https://wiki.x2go.org/doku.php/wiki:bugs" "</a></center>\n"); #else // defined (Q_OS_WIN) if (userSshd) { @@ -11653,7 +11653,7 @@ void ONMainWindow::printSshDError_startupFailure() "Please report a bug on:\n" "<center><a href=\"https://wiki.x2go.org/doku.php/wiki:bugs\">" - "https://wiki.x2go.org/doku.php/wiki:bugs" + "https://wiki.x2go.org/doku.php/wiki:bugs" "</a></center>\n"); } else { @@ -11662,16 +11662,16 @@ void ONMainWindow::printSshDError_startupFailure() detailed_error_message += tr ("On OS X, please follow the following steps to enable " "SSH service:" "<ul>" - "<li>Open <b>System Preferences</b> (Applications -> System Preferences)</li>" - "<li>Go to <b>Sharing</b></li>" - "<li>Tick the checkbox besides <b>Remote Login</b></li>" - "<li>Check that <b>Allow access for:</b> is set to either:" - "<ul>" - "<li>All users: <b>no further steps necessary</b></li>" - "<li>Only these users <b>and your user name is included in the list</b></li>" - "</ul>" - "<li>Optionally, add your user name to the allowed list " - "via the <b>Plus Button</b></li>" + "<li>Open <b>System Preferences</b> (Applications -> System Preferences)</li>" + "<li>Go to <b>Sharing</b></li>" + "<li>Tick the checkbox besides <b>Remote Login</b></li>" + "<li>Check that <b>Allow access for:</b> is set to either:" + "<ul>" + "<li>All users: <b>no further steps necessary</b></li>" + "<li>Only these users <b>and your user name is included in the list</b></li>" + "</ul>" + "<li>Optionally, add your user name to the allowed list " + "via the <b>Plus Button</b></li>" "</ul>" "<b>Warning: enabling SSH access will allow any user on the network to connect " "to your machine. It is your responsibility to set a strong password for every " @@ -11711,7 +11711,7 @@ void ONMainWindow::printSshDError_noHostPubKey() "If you see this message, please report a bug on:\n" "<center><a href=\"https://wiki.x2go.org/doku.php/wiki:bugs\">" - "https://wiki.x2go.org/doku.php/wiki:bugs" + "https://wiki.x2go.org/doku.php/wiki:bugs" "</a></center>\n"); #else // defined (Q_OS_WIN) if (userSshd) { @@ -11719,7 +11719,7 @@ void ONMainWindow::printSshDError_noHostPubKey() "Please report a bug on:\n" "<center><a href=\"https://wiki.x2go.org/doku.php/wiki:bugs\">" - "https://wiki.x2go.org/doku.php/wiki:bugs" + "https://wiki.x2go.org/doku.php/wiki:bugs" "</a></center>\n"); } else { @@ -11728,11 +11728,11 @@ void ONMainWindow::printSshDError_noHostPubKey() "required keys:" "<ul>" - "<li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li>" - "<li>Run this command: <b>ssh -p " + clientSshPort.toAscii () - + " localhost</b></li>" - "<li>You do not need to login. Just quit the Terminal application " - "via Cmd + Q</li>" + "<li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li>" + "<li>Run this command: <b>ssh -p " + clientSshPort.toAscii () + + " localhost</b></li>" + "<li>You do not need to login. Just quit the Terminal application " + "via Cmd + Q</li>" "</ul>"); #else // defined (Q_OS_DARWIN) detailed_error_message += tr ("Please ask your system administrator to generate the required host keys.\n\n" -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git