This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 128d4983740a03a14a638653617b60aab1a4c6c8 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 4 04:53:21 2016 +0200 src/{onmainwindow,sshmasterconnection}.cpp: refactoring and whitespace only changes following up the #1027 patch. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 34 +++++++++++++++++----------------- src/sshmasterconnection.cpp | 15 ++++++++------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index d418845..77f7d12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium entries to a PATH-like string if they do not exist in there yet. - src/onmainwindow.cpp: replace old code to modify the PATH value with the new add_to_path () function. + - src/{onmainwindow,sshmasterconnection}.cpp: refactoring and whitespace only + changes following up the #1027 patch. [ Mike DePaulo ] * New upstream release (4.0.5.2): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 18ca368..925085b 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -2950,29 +2950,29 @@ void ONMainWindow::slotSshServerAuthPassphrase(SshMasterConnection* connection, } -void ONMainWindow::slotSshServerAuthChallengeResponse(SshMasterConnection* connection, QString Challenge) +void ONMainWindow::slotSshServerAuthChallengeResponse(SshMasterConnection* connection, QString challenge) { - bool ok; + bool ok = false; QString message; - message=Challenge; + message = challenge; - QString phrase=QInputDialog::getText(0,connection->getUser()+"@"+connection->getHost()+":"+QString::number(connection->getPort()), - message,QLineEdit::Password,QString::null, &ok); - if(!ok) - { - phrase=QString::null; + QString phrase = QInputDialog::getText (0, connection->getUser () + "@" + connection->getHost () + ":" + QString::number (connection->getPort ()), + message, QLineEdit::Password, QString::null, &ok); + if (!ok) { + phrase = QString::null; } - else - { - if(phrase==QString::null) - phrase=""; + else { + if (phrase == QString::null) { + phrase = ""; + } } - connection->setKeyPhrase(phrase); - if(isHidden()) - { - show(); - QTimer::singleShot(1, this, SLOT(hide())); + + connection->setKeyPhrase (phrase); + + if (isHidden ()) { + show (); + QTimer::singleShot (1, this, SLOT (hide ())); } } diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 1d330a3..d85c730 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -884,17 +884,18 @@ bool SshMasterConnection::userChallengeAuth() bool need_to_display_auth_code_prompt = false; const std::size_t challenge_auth_code_prompts_size = (sizeof (challenge_auth_code_prompts_)/sizeof (*challenge_auth_code_prompts_)); - if( pr.contains("challenge", Qt::CaseInsensitive) ) { + if (pr.contains ("challenge", Qt::CaseInsensitive)) { x2goDebug << "prompt contains 'challenge': " << pr << endl; has_challenge_auth_code_prompt = true; need_to_display_auth_code_prompt = true; - } else { + } + else { for (std::size_t i = 0; i < challenge_auth_code_prompts_size; ++i) { - x2goDebug << "Checking against known prompt #" << i << ": " << challenge_auth_code_prompts_[i] << endl; - if (pr.startsWith (challenge_auth_code_prompts_[i])) { - has_challenge_auth_code_prompt = true; - break; - } + x2goDebug << "Checking against known prompt #" << i << ": " << challenge_auth_code_prompts_[i] << endl; + if (pr.startsWith (challenge_auth_code_prompts_[i])) { + has_challenge_auth_code_prompt = true; + break; + } } } -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git