The branch, master has been updated via 6063b28117cf9d525cd5db566ef2736e0b2ca349 (commit) via 4759b6761cd5c23b83177f24d4e0cff981bcaa70 (commit) from ef8c9486314e87bf6aeb748b46b1c35f1b975213 (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 6063b28117cf9d525cd5db566ef2736e0b2ca349 Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Date: Tue Oct 2 13:56:24 2012 +0200 Hide system tray icon before close commit 4759b6761cd5c23b83177f24d4e0cff981bcaa70 Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Date: Tue Oct 2 13:20:43 2012 +0200 Fixing SSH proxy support for Windows ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ onmainwindow.cpp | 6 ++++-- sshmasterconnection.cpp | 10 ++++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 74a4339..8de2f27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,6 +74,8 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low - reduce listen interval for ssh-tunnell to 100 msec - fixed visibility of SSH-proxy box with direct RDP sessions - SshProcess is only usable over SshMasterConnection + - Fixing SSH proxy support for Windows + - Hide system tray icon before close [ Ricardo Diaz ] * New upstream version (3.99.3.0): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 8f452cb..7e66572 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -1231,6 +1231,8 @@ void ONMainWindow::slotResize ( const QSize sz ) void ONMainWindow::closeClient() { + if(trayIcon) + trayIcon->hide(); closeEventSent=true; if ( !startMaximized && !startHidden && !embedMode ) { @@ -4803,8 +4805,8 @@ void ONMainWindow::slotRetResumeSess ( bool result, resumingSession.sessionId+ "/.pulse-cookie"; sshConnection->copyFile(cooFile, - destFile, this, SLOT ( slotPCookieReady ( bool, QString,int )); - parecTunnelOk=true; + destFile, this, SLOT ( slotPCookieReady ( bool, QString,int ))); + parecTunnelOk=true; #endif } } diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 619d2e7..35b89c7 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -27,8 +27,6 @@ #include <stdio.h> #include "sshprocess.h" -#include <sys/socket.h> /* for socket(), connect(), send(), and recv() */ -#include <arpa/inet.h> /* for sockaddr_in and inet_addr() */ #include <QStringList> #include <QFile> @@ -40,6 +38,8 @@ #include <math.h> #ifndef Q_OS_WIN +#include <sys/socket.h> /* for socket(), connect(), send(), and recv() */ +#include <arpa/inet.h> /* for sockaddr_in and inet_addr() */ #include <arpa/inet.h> #include <netinet/tcp.h> #include <qt4/QtNetwork/qabstractsocket.h> @@ -539,7 +539,11 @@ 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 ); } @@ -1280,7 +1284,9 @@ void SshMasterConnection::finalize ( int item ) } if ( tcpSocket>0 ) { +#ifndef Q_OS_WIN shutdown(tcpSocket, SHUT_RDWR); +#endif close ( tcpSocket ); } SshProcess* proc=channelConnections[item].creator; 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).