This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/x2goplugin-patch in repository x2goclient. discards d662c13 src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798. omits 5b2c94a {onmainwindow.cpp,README.i18n}: fix localization -- resource strings were not correctly updated. new e20207b {onmainwindow.cpp,README.i18n}: fix localization -- resource strings were not correctly updated. Fixes: #828. new 72196ca src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d662c13) \ N -- N -- N refs/heads/bugfix/x2goplugin-patch (72196ca) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/x2goplugin-patch in repository x2goclient. commit e20207bcfc271286fcb07b0a3b471fff5809fab4 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Mar 25 21:17:38 2015 +0100 {onmainwindow.cpp,README.i18n}: fix localization -- resource strings were not correctly updated. Fixes: #828. --- README.i18n | 6 +++--- debian/changelog | 2 ++ src/onmainwindow.cpp | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.i18n b/README.i18n index 36b79bb..d2a9386 100644 --- a/README.i18n +++ b/README.i18n @@ -47,7 +47,7 @@ First, copy the file x2goclient_de.ts, for instance via the terminal. You can do this by running the following commands: -1. cd x2goclient/ +1. cd x2goclient/res/i18n 2. cp x2goclient_de.ts "x2goclient_da.ts <or what language your going to translate it into>". @@ -60,7 +60,7 @@ The tool needed for editing qt translation files is ,,linguist-qt4'' $ open Ubuntu Software Center, search for ,,Qt 4 Linguist'' and install it from there # <--for ubuntu -Now open your language file in <current_dir>/x2goclient/x2goclient_<lang>.ts and edit it with +Now open your language file in <current_dir>/x2goclient/res/i18n/x2goclient_<lang>.ts and edit it with linguist-qt4. NOTE: Make sure you translate all boldly marked items: non-translated as well as fuzzy @@ -72,7 +72,7 @@ Sending in the Translation File ------------------------------- When done, please send the complete translation file - <current_dir>/x2goclient/x2goclient_<lang>.ts + <current_dir>/x2goclient/res/i18n/x2goclient_<lang>.ts to x2go-i18n@lists.x2go.org and remove your working copy of X2Go Client from your system (or read how to use Git and keep the folder.) diff --git a/debian/changelog b/debian/changelog index 5481173..c48c4d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -243,6 +243,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low Linux and Windows. - onmainwindow:cpp: correctly pass escaped single quote when writing remote xinerama config file. Post-fixup for #797. + - {onmainwindow.cpp,README.i18n}: fix localization -- resource strings + were not correctly updated. Fixes: #828. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index fe10646..8f32562 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -548,7 +548,7 @@ void ONMainWindow::slotSyncX() void ONMainWindow::installTranslator() { QTranslator* x2goclientTranslator=new QTranslator(); - QString filename=QString ( ":/x2goclient_%1" ).arg ( + QString filename=QString ( ":/i18n/x2goclient_%1" ).arg ( QLocale::system().name() ); filename=filename.toLower(); if ( !x2goclientTranslator->load ( filename ) ) @@ -563,7 +563,7 @@ void ONMainWindow::installTranslator() QTranslator* qtTranslator=new QTranslator; - filename=QString ( ":/qt_%1" ).arg ( QLocale::system().name() ); + filename=QString ( ":/i18n/qt_%1" ).arg ( QLocale::system().name() ); if ( !qtTranslator->load ( filename ) ) { x2goWarningf(2)<<tr("Can't load translator: ") + filename.toAscii(); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/x2goplugin-patch in repository x2goclient. commit 72196ca77c4acba227edcb7d27eaa62792225d59 Author: Nicolas Husson <nicolas.husson@tactualities.com> Date: Tue Mar 10 06:03:28 2015 +0100 src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798. v2: refactor patch, fix whitespace issues. (Mihai Moldovan) --- debian/changelog | 6 ++ src/onmainwindow.cpp | 149 +++++++++++++++++++++++++++++-------------- src/sshmasterconnection.cpp | 5 +- 3 files changed, 112 insertions(+), 48 deletions(-) diff --git a/debian/changelog b/debian/changelog index c48c4d2..6a635e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -266,6 +266,12 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low correctly: remove the %i flag and replace %c with the application name. Fixes: #827. + [ Nicolas Husson ] + * New upstream release (4.0.4.0): + - src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy + configuration with x2goplugin. Fixes: #798. + + v2: refactor patch, fix whitespace issues. (Mihai Moldovan) + -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 8f32562..c4df667 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3296,50 +3296,53 @@ bool ONMainWindow::startSession ( const QString& sid ) currentKey=findSshKeyForServer(user, host, sshPort); } - useproxy=(st->setting()->value ( - sid+"/usesshproxy", - false - ).toBool() ); + if (!embedMode) { + useproxy = (st->setting ()->value (sid + "/usesshproxy", + false).toBool ()); - QString prtype= st->setting()->value ( - sid+"/sshproxytype", - "SSH" - ).toString() ; + QString prtype = (st->setting ()->value (sid + "/sshproxytype", + "SSH").toString ()); + if (prtype.toLower () == "http") { + proxyType = SshMasterConnection::PROXYHTTP; + } + else { + proxyType = SshMasterConnection::PROXYSSH; + } - if(prtype=="HTTP") - { - proxyType=SshMasterConnection::PROXYHTTP; - } - else - { - proxyType=SshMasterConnection::PROXYSSH; - } + proxylogin = (st->setting ()->value (sid + "/sshproxyuser", + QString ()).toString ()); - proxylogin=(st->setting()->value ( - sid+"/sshproxyuser", - QString() - ).toString() ); + proxyKey = (st->setting ()->value (sid + "/sshproxykeyfile", + QString ()).toString ()); + proxyKey = expandHome (proxyKey); - proxyKey=(st->setting()->value ( - sid+"/sshproxykeyfile", - QString() - ).toString() ); - proxyKey=expandHome(proxyKey); + proxyserver = (st->setting ()->value (sid + "/sshproxyhost", + QString ()).toString ()); - proxyserver=(st->setting()->value ( - sid+"/sshproxyhost", - QString() - ).toString() ); + proxyport = (st->setting ()->value (sid + "/sshproxyport", + 22).toInt ()); - proxyport=(st->setting()->value ( - sid+"/sshproxyport", - 22 - ).toInt() ); - if(proxyserver.indexOf(":")!=-1) - { - QStringList parts=proxyserver.split(":"); - proxyserver=parts[0]; - proxyport=parts[1].toInt(); + proxyAutologin = (st->setting ()->value (sid + "/sshproxyautologin", + false).toBool ()); + + proxyKrbLogin = (st->setting ()->value (sid + "/sshproxykrblogin", + false).toBool ()); + } + else { + useproxy = config.useproxy; + proxyType = config.proxyType; + proxylogin = config.proxylogin; + proxyKey = config.proxyKey; + proxyserver = config.proxyserver; + proxyport = config.proxyport; + proxyAutologin = config.proxyAutologin; + proxyKrbLogin = config.proxyKrbLogin; + } + + if (proxyserver.indexOf (":") != -1) { + QStringList parts = proxyserver.split (":"); + proxyserver = parts[0]; + proxyport = parts[1].toInt (); } bool proxySamePass=(st->setting()->value ( @@ -3350,15 +3353,6 @@ bool ONMainWindow::startSession ( const QString& sid ) sid+"/sshproxysameuser", false ).toBool() ); - proxyAutologin=(st->setting()->value ( - sid+"/sshproxyautologin", - false - ).toBool() ); - - proxyKrbLogin=(st->setting()->value ( - sid+"/sshproxykrblogin", - false - ).toBool() ); if(proxyKey.length()<=0 && proxyType==SshMasterConnection::PROXYSSH) { @@ -10745,6 +10739,67 @@ void ONMainWindow::processCfgLine ( QString line ) config.connectionts=lst[1]; return; } + if (lst[0] == "usesshproxy") + { + config.useproxy = true; + if (lst[1].toLower () == "true") { + config.useproxy = true; + } + else { + config.useproxy = false; + } + return; + } + if (lst[0] == "sshproxytype") + { + if (lst[1].toLower () == "http") { + config.proxyType = SshMasterConnection::PROXYHTTP; + } + else { + config.proxyType = SshMasterConnection::PROXYSSH; + } + return; + } + if (lst[0] == "sshproxyuser") + { + config.proxylogin = lst[1]; + return; + } + if (lst[0] == "sshproxyhost") + { + config.proxyserver = lst[1]; + return; + } + if (lst[0] == "sshproxyport") + { + config.proxyport = lst[1].toInt (); + return; + } + if (lst[0] == "sshproxyautologin") + { + if (lst[1].toLower () == "true") { + config.proxyAutologin = true; + } + else { + config.proxyAutologin = false; + } + return; + } + if (lst[0] == "sshproxykrblogin") + { + if (lst[1].toLower () == "true") { + config.proxyKrbLogin = true; + } + else { + config.proxyKrbLogin = false; + } + return; + } + if (lst[0] == "sshproxykeyfile") + { + config.proxyKey = lst[1]; + return; + } } void ONMainWindow::slotChangeKbdLayout(const QString& layout) diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index e9a7008..1e11c62 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -165,6 +165,9 @@ SshMasterConnection::SshMasterConnection (QObject* parent, QString host, int por breakLoop=false; kerberosDelegation=false; + x2goDebug << "SshMasterConnection, host " << host << "port " << port << "user " << user + << "useproxy " << useproxy << "proxyserver " << proxyserver + << "proxyport " << proxyport; this->host=host; this->port=port; this->user=user; @@ -443,7 +446,7 @@ void SshMasterConnection::run() #endif if(useproxy && proxytype==PROXYSSH) { - + x2goDebug << "proxyserver: " << proxyserver << "proxyport: " << proxyport << "proxylogin: " << proxylogin; sshProxy=new SshMasterConnection (0, proxyserver, proxyport,acceptUnknownServers, proxylogin, proxypassword, proxykey, proxyautologin, proxyKrbLogin, false); connect ( sshProxy, SIGNAL ( connectionOk(QString) ), this, SLOT ( slotSshProxyConnectionOk() ) ); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org