x2go-commits September 2013

x2go-commits@lists.x2go.org

2 participants
2415 discussions

x2goclient.git - build-main (branch) updated: 4.0.1.0-5-gcfa1e28
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via cfa1e28665a8fa2f34f7546af7bd8d25ea1ba8bd (commit) from 2419bf34d1ecd28696e6c129001057c4de77a328 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: onmainwindow.cpp | 6 +++--- portable/stopu3client.cpp | 4 ++-- printdialog.ui | 2 +- x2goclient_da.ts | 10 +++++----- x2goclient_de.ts | 8 ++++---- x2goclient_es.ts | 8 ++++---- x2goclient_fr.ts | 8 ++++---- x2goclient_nb_no.ts | 8 ++++---- x2goclient_ru.ts | 10 +++++----- x2goclient_sv.ts | 8 ++++---- x2goclient_zh_tw.ts | 8 ++++---- xsettingsui.ui | 2 +- 12 files changed, 41 insertions(+), 41 deletions(-) The diff of changes is: diff --git a/onmainwindow.cpp b/onmainwindow.cpp index dbcb092..31dbc17 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -139,7 +139,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) cleanAskPass(); - setWindowTitle ( tr ( "X2Go client" ) ); + setWindowTitle ( tr ( "X2Go Client" ) ); ld=0; tunnel=0l; sndTunnel=0l; @@ -205,7 +205,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) { portableDataPath=u3Path; ONMainWindow::portable=true; - setWindowTitle ( "X2Go client - U3" ); + setWindowTitle ( "X2Go Client - U3" ); } #endif @@ -7481,7 +7481,7 @@ void ONMainWindow::slotAbout() "further information." ); QMessageBox::about ( this,tr ( "About X2GO client" ), - tr ( "X2Go client V. " ) +VERSION+ + tr ( "X2Go Client V. " ) +VERSION+ " (Qt - "+qVersion() +")"+ aboutStr ); } diff --git a/portable/stopu3client.cpp b/portable/stopu3client.cpp index 3cc7c67..c6e7a4f 100644 --- a/portable/stopu3client.cpp +++ b/portable/stopu3client.cpp @@ -27,11 +27,11 @@ int main() { - HWND wid=FindWindowEx(0,0,0,"X2Go client - U3"); + HWND wid=FindWindowEx(0,0,0,"X2Go Client - U3"); while(wid) { HWND prevWid=wid; - wid=FindWindowEx(0,wid,0,"X2Go client - U3"); + wid=FindWindowEx(0,wid,0,"X2Go Client - U3"); PostMessage(prevWid,WM_CLOSE,0,0); } return 0; diff --git a/printdialog.ui b/printdialog.ui index 4f52e41..9420099 100644 --- a/printdialog.ui +++ b/printdialog.ui @@ -15,7 +15,7 @@ </rect> </property> <property name="windowTitle"> - <string>Print - X2Go client</string> + <string>Print - X2Go Client</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> diff --git a/x2goclient_da.ts b/x2goclient_da.ts index 0ef73a7..eba13a4 100644 --- a/x2goclient_da.ts +++ b/x2goclient_da.ts @@ -792,7 +792,7 @@ Public key hash: </translation> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2go klient</translation> </message> <message> @@ -1587,8 +1587,8 @@ Ugemte dokumenter vil gå tabt</translation> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> - <translation>X2Go client V. </translation> + <source>X2Go Client V. </source> + <translation>X2Go Client V. </translation> </message> <message> <location filename="onmainwindow.cpp" line="7508"/> @@ -1803,7 +1803,7 @@ du kan installere sshd med <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Udskrift - X2Go klient</translation> </message> <message> @@ -2807,7 +2807,7 @@ lydsystemets forbindelse igennem firewalls</translation> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>start X-Server sammen med X2Go klient</translation> </message> <message> diff --git a/x2goclient_de.ts b/x2goclient_de.ts index d8fe44c..ba726ae 100644 --- a/x2goclient_de.ts +++ b/x2goclient_de.ts @@ -1841,7 +1841,7 @@ Please check your settings</source> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation></translation> </message> <message> @@ -2019,7 +2019,7 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation>X2GoClient V. </translation> </message> <message> @@ -2357,7 +2357,7 @@ Sie können SSHD über folgenden Befehl installieren: </message> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Drucken - X2GoClient</translation> </message> </context> @@ -3385,7 +3385,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>X-Server auf X2GoClient starten</translation> </message> <message> diff --git a/x2goclient_es.ts b/x2goclient_es.ts index 8fb5b01..dc31106 100644 --- a/x2goclient_es.ts +++ b/x2goclient_es.ts @@ -791,7 +791,7 @@ Hash de su clave pública: </translation> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>Cliente X2Go</translation> </message> <message> @@ -1590,7 +1590,7 @@ Los documentos no guardados se perderán</translation> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation>cliente X2Go v. </translation> </message> <message> @@ -1806,7 +1806,7 @@ puedes instalar sshd con <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Imprimir - Cliente X2Go</translation> </message> <message> @@ -2809,7 +2809,7 @@ el sonido en conexiones a través de firewalls</translation> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>iniciar ServidorX en el inicio del cliente X2Go</translation> </message> <message> diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index 6a8c203..8d77c9e 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -618,7 +618,7 @@ Public key hash: </source> <translation>pc105/us</translation> </message> <message> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2Go Client</translation> </message> <message> @@ -1158,7 +1158,7 @@ Unsaved documents will be lost</source> <translation type="unfinished"></translation> </message> <message> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation type="unfinished"></translation> </message> <message> @@ -1341,7 +1341,7 @@ you can install sshd with <translation type="unfinished"></translation> </message> <message> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation type="unfinished"></translation> </message> </context> @@ -2101,7 +2101,7 @@ sound system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts index 3f9ec66..219c205 100644 --- a/x2goclient_nb_no.ts +++ b/x2goclient_nb_no.ts @@ -1489,7 +1489,7 @@ Vennligst sjekk instillingene dine</translation> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2Go klient</translation> </message> <message> @@ -1670,7 +1670,7 @@ Offentlig nøkkel: </translation> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation>X2Go klient v. </translation> </message> <message> @@ -1998,7 +1998,7 @@ Du kan installere sshd med: <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Utskrift - X2Go klient</translation> </message> <message> @@ -3011,7 +3011,7 @@ lydsystem forbindelser gjennom brannmurer</translation> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>start X-Serveren når X2Go klienten startes</translation> </message> <message> diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts index 6984c5c..61bd030 100644 --- a/x2goclient_ru.ts +++ b/x2goclient_ru.ts @@ -1881,7 +1881,7 @@ Please check your settings</source> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation></translation> </message> <message> @@ -2003,7 +2003,7 @@ Please check your settings</source> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation>X2Go Client V. </translation> </message> <message> @@ -2342,7 +2342,7 @@ you can install sshd with </message> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Печать - X2Go Client</translation> </message> </context> @@ -3366,8 +3366,8 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> - <translation>запускать X-Server при запуске X2Go client</translation> + <source>start X-Server on X2Go Client start</source> + <translation>запускать X-Server при запуске X2Go Client</translation> </message> <message> <location filename="xsettingsui.ui" line="114"/> diff --git a/x2goclient_sv.ts b/x2goclient_sv.ts index 9d3a253..73fab61 100644 --- a/x2goclient_sv.ts +++ b/x2goclient_sv.ts @@ -796,7 +796,7 @@ Publik nyckel: </translation> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2Go-klient</translation> </message> <message> @@ -1596,7 +1596,7 @@ Data som ej sparats kommer att förloras</translation> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation>X2Go-klient V. </translation> </message> <message> @@ -1831,7 +1831,7 @@ du kan installera sshd med (Debian/Ubuntu) <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Utskrift - X2Go-klient</translation> </message> <message> @@ -2835,7 +2835,7 @@ ljudström genom brandväggar</translation> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>Starta X-server när X2Go-klienten startas</translation> </message> <message> diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts index 4d93162..1d03c34 100644 --- a/x2goclient_zh_tw.ts +++ b/x2goclient_zh_tw.ts @@ -790,7 +790,7 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2Go用戶端</translation> </message> <message> @@ -1587,7 +1587,7 @@ Unsaved documents will be lost</source> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation>X2Go 客戶端 V. </translation> </message> <message> @@ -1819,7 +1819,7 @@ you can install sshd with <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>列印 - X2Go用戶端</translation> </message> <message> @@ -2822,7 +2822,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>當X2Go用戶端啟動時啟動X伺服器</translation> </message> <message> diff --git a/xsettingsui.ui b/xsettingsui.ui index e58ba50..9aa8ffa 100644 --- a/xsettingsui.ui +++ b/xsettingsui.ui @@ -106,7 +106,7 @@ <item> <widget class="QCheckBox" name="cbOnstart"> <property name="text"> - <string>start X-Server on X2Go client start</string> + <string>start X-Server on X2Go Client start</string> </property> <property name="checked"> <bool>false</bool> hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-10-g56c9d3a
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 56c9d3ab2021549fc2fede7f5bceac0af342fc73 (commit) from 627cd24cb270a0c167bef64867e78e772925640e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ onmainwindow.cpp | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9be4d80..94d57e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,11 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low Let's consider a given SSH private key that fails to log the user in as an overall login failure. (Fixes: 141). + [ Orion Poplawski ] + * New upstream version (4.0.1.0): + - Instead of using a hard-code DPI of 96, use local DPI settings for new + sessions if not explicitly set in session profile (Fixes: #164). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100 x2goclient (4.0.1.0-0~x2go1) unstable; urgency=low diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 31dbc17..5f37cc1 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -61,8 +61,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) showHaltBtn=false; defaultUseSound=true; defaultSetKbd=true; - defaultSetDPI=false; - defaultDPI=96; extStarted=false; cmdAutologin=false; defaultLink=2; @@ -107,6 +105,16 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) cmdAutologin=false; +// Try to determine the native DPI and use it for the default + int dpix = QApplication::desktop()->physicalDpiX(); + int dpiy = QApplication::desktop()->physicalDpiY(); + if ( dpix >0 && dpiy >0) { + defaultSetDPI=true; + defaultDPI=(dpix+dpiy)/2; + } else { + defaultSetDPI=false; + defaultDPI=96; + } #ifdef Q_OS_WIN clientSshPort="7022"; @@ -6661,7 +6669,7 @@ void ONMainWindow::showHelp() "--user=<username>\t\t select user 'username'\n" "--geomerty=<W>x<H>|fullscreen\t set default geometry, default " "value '800x600'\n" - "--dpi=<dpi>\t\t\t set dpi of x2goagent to dpi, default not set\n" + "--dpi=<dpi>\t\t\t set dpi of x2goagent to dpi, default set to same as local display\n" "--link=<modem|isdn|adsl|wan|lan> set default link type, " "default 'adsl'\n" "--pack=<packmethod>\t\t set default pack method, default " hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-6-gb4c4811
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via b4c481184a307d9b522542814f838067e2e78bf3 (commit) from cfa1e28665a8fa2f34f7546af7bd8d25ea1ba8bd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index dbe9045..3470042 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] - * Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname - resolution. (Fixes: #151). - - waiting for x2gocmdexitmessage to return before closing in hidden mode + * New upstream version (4.0.1.0): + - Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname + resolution. (Fixes: #151). + - Wait for x2gocmdexitmessage to return before closing in hidden mode. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100 hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-7-gfe4408b
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via fe4408b12c982b81c56c52f37230865f4e9f41ea (commit) from b4c481184a307d9b522542814f838067e2e78bf3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ sshmasterconnection.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3470042..9be4d80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,12 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low resolution. (Fixes: #151). - Wait for x2gocmdexitmessage to return before closing in hidden mode. + [ Mike Gabriel ] + * New upstream version (4.0.1.0): + - If a priv SSH key has been specified, skip the autologin procedure. + Let's consider a given SSH private key that fails to log the user + in as an overall login failure. (Fixes: 141). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100 x2goclient (4.0.1.0-0~x2go1) unstable; urgency=low diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 196cec0..eb75237 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -847,7 +847,7 @@ bool SshMasterConnection::userAuthWithKey() bool SshMasterConnection::userAuth() { - if ( autologin ) + if ( autologin && key=="" ) if ( userAuthAuto() ) return true; if ( key!="" ) hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-4-g2419bf3
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 2419bf34d1ecd28696e6c129001057c4de77a328 (commit) from 036222619b0e93c7dce07204a5b04ad60e689c49 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + onmainwindow.cpp | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 227a7af..dbe9045 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname resolution. (Fixes: #151). + - waiting for x2gocmdexitmessage to return before closing in hidden mode -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100 diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 840a699..dbcb092 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -5284,9 +5284,11 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) delete sshConnection; x2goDebug<<"done"<<endl; sshConnection=0; + if ( startHidden ) + { + close(); + } } - if ( startHidden ) - close(); if ( readExportsFrom!=QString::null ) { @@ -8270,9 +8272,6 @@ void ONMainWindow::slotCmdMessage ( bool result,QString output, passForm->setEnabled ( true ); pass->setFocus(); pass->selectAll(); - delete sshConnection; - sshConnection=0; - return; } if ( output.indexOf ( "X2GORUNCOMMAND ERR NOEXEC:" ) !=-1 ) { @@ -8283,8 +8282,13 @@ void ONMainWindow::slotCmdMessage ( bool result,QString output, cmd,QMessageBox::Ok, QMessageBox::NoButton ); } - delete sshConnection; + if(sshConnection) + delete sshConnection; sshConnection=0; + if ( startHidden ) + { + close(); + } } hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-9-g627cd24
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 627cd24cb270a0c167bef64867e78e772925640e (commit) from 4f361e1f3d30ab853f8eb2461959dccac6efb732 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/x2goclient.docs | 1 - debian/x2goplugin-provider.docs | 1 - debian/x2goplugin.docs | 1 - 3 files changed, 3 deletions(-) delete mode 100644 debian/x2goplugin-provider.docs delete mode 100644 debian/x2goplugin.docs The diff of changes is: diff --git a/debian/x2goclient.docs b/debian/x2goclient.docs index c52b905..68ac0b9 100644 --- a/debian/x2goclient.docs +++ b/debian/x2goclient.docs @@ -1,2 +1 @@ HOWTO.GPGCARD -debian/upstream/changelog diff --git a/debian/x2goplugin-provider.docs b/debian/x2goplugin-provider.docs deleted file mode 100644 index 90699c6..0000000 --- a/debian/x2goplugin-provider.docs +++ /dev/null @@ -1 +0,0 @@ -debian/upstream/changelog diff --git a/debian/x2goplugin.docs b/debian/x2goplugin.docs deleted file mode 100644 index 90699c6..0000000 --- a/debian/x2goplugin.docs +++ /dev/null @@ -1 +0,0 @@ -debian/upstream/changelog hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-3-g0362226
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 036222619b0e93c7dce07204a5b04ad60e689c49 (commit) from feef5058b44f1dba45c8cd79bb6b687317284f36 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 067b4a1..227a7af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,8 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low - [ Mike Gabriel ] - * Continue development... - [ Oleksandr Shneyder ] - * Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname resolution + * Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname + resolution. (Fixes: #151). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100 hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-2-gfeef505
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via feef5058b44f1dba45c8cd79bb6b687317284f36 (commit) from 085568ae95cb3eaa5e9ec26723edb800eb4f132e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ sshmasterconnection.cpp | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4b82401..067b4a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * Continue development... + [ Oleksandr Shneyder ] + * Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname resolution + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100 x2goclient (4.0.1.0-0~x2go1) unstable; urgency=low diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 0db4077..196cec0 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -155,7 +155,7 @@ void SshMasterConnection::slotSshProxyConnectionOk() while ( ONMainWindow::isServerRunning ( localProxyPort ) ) ++localProxyPort; - sshProxy->startTunnel ( host, port, "localhost",localProxyPort,false,this, SLOT ( slotSshProxyTunnelOk(int)), + sshProxy->startTunnel ( host, port, "127.0.0.1",localProxyPort,false,this, SLOT ( slotSshProxyTunnelOk(int)), SLOT ( slotSshProxyTunnelFailed(bool,QString,int))); } @@ -574,11 +574,7 @@ bool SshMasterConnection::sshConnect() QByteArray tmpBA = host.toLocal8Bit(); if(useproxy && proxytype==PROXYSSH) { -#ifdef Q_OS_WIN ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, "127.0.0.1" ); -#else - ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, "localhost" ); -#endif ssh_options_set ( my_ssh_session, SSH_OPTIONS_PORT, &localProxyPort ); } hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-1-g085568a
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 085568ae95cb3eaa5e9ec26723edb800eb4f132e (commit) from 1b4260f86a6fda01c5263fa3d27504677a3cdfac (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 ++++++ version.h | 2 +- x2goplugin.rc | 10 +++++----- 4 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index a7393ba..9830921 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.1.0 +4.0.1.1 diff --git a/debian/changelog b/debian/changelog index f3acdd3..4b82401 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100 + x2goclient (4.0.1.0-0~x2go1) unstable; urgency=low [ Frédéric Motte ] diff --git a/version.h b/version.h index 269a15d..77cc6c7 100644 --- a/version.h +++ b/version.h @@ -15,5 +15,5 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#define VERSION "4.0.1.0" +#define VERSION "4.0.1.1" diff --git a/x2goplugin.rc b/x2goplugin.rc index 1f830fc..d9831d9 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 4,0,1,0 - PRODUCTVERSION 4,0,1,0 + FILEVERSION 4,0,1,1 + PRODUCTVERSION 4,0,1,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "4, 0, 1 ,0\0" + VALUE "FileVersion", "4, 0, 1 ,1\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2013 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 4.0.1.0\0" - VALUE "ProductVersion", "4, 0, 1, 0\0" + VALUE "ProductName", "X2GoClient Plug-in 4.0.1.1\0" + VALUE "ProductVersion", "4, 0, 1, 1\0" END END BLOCK "VarFileInfo" hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

python-x2go.git - master (branch) updated: 0.4.0.8-12-g0ed9ba9
by git-admin＠x2go.org 09 Sep '13

09 Sep '13

The branch, master has been updated via 0ed9ba982fd0bb59d1a6c9a529004fcbe0c84387 (commit) from 1b463da78fdd7fca76e27c44f41e3f02fcd20622 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0ed9ba982fd0bb59d1a6c9a529004fcbe0c84387 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 9 21:49:28 2013 +0200 Rewrite passwords that are not string/unicode to an empty string. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/control/_stdout.py | 5 +++++ x2go/sshproxy.py | 4 ++++ 3 files changed, 10 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 76a4f9b..0e364be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Keep private key information even if force_password_auth is set in the control session's connect() method. - Fix parameter handling in X2GoSession.connect(). + - Rewrite passwords that are not string/unicode to an empty string. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index f3999d3..22bc014 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -771,6 +771,11 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): """ _fake_hostname = None + if type(password) not in (types.StringType, types.UnicodeType): + password = '' + if type(sshproxy_password) not in (types.StringType, types.UnicodeType): + sshproxy_password = '' + if unique_hostkey_aliases is not None: self.unique_hostkey_aliases = unique_hostkey_aliases # prep the fake hostname with the real hostname, so we trigger the corresponding code path in diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index 3cdf26b..e2b62d9 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -29,6 +29,7 @@ import os import copy import paramiko import threading +import types import string import random @@ -196,6 +197,9 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread): if username is None: username = _CURRENT_LOCAL_USER + if type(password) not in (types.StringType, types.UnicodeType): + password = '' + self._keepalive = True self.session_instance = session_instance hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2013