This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from f9ef287 Provide empty Turkish translation file. new 5fb997d Apply conform-to-stricter-type-checking-mingw482.patch from George Trakatelis (uom.edu.gr) new 36657f7 Apply add-libraries-to-build-with-VS2010-command-line.patch from George Trakatelis (uom.edu.gr) new 8707629 Apply conform-to-stricter-type-checking-VS2010-close-socket.patch from George Trakatelis (uom.edu.gr) (Fixes: #642) The 3 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: onmainwindow.cpp | 2 +- sshmasterconnection.cpp | 9 ++++++--- wapi.cpp | 1 + x2goclient.pro | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) -- Alioth's /srv/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 master in repository x2goclient. commit 5fb997d29f304bcdac5c5b9c6085d795e97456a5 Author: Mike DePaulo <mikedep333@gmail.com> Date: Mon Dec 1 08:18:57 2014 -0500 Apply conform-to-stricter-type-checking-mingw482.patch from George Trakatelis (uom.edu.gr) --- onmainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onmainwindow.cpp b/onmainwindow.cpp index fa6c8f1..4f9d64d 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -5118,7 +5118,7 @@ void ONMainWindow::slotRetResumeSess ( bool result, #endif //Q_OS_WIN if ( sshSndTunnel ) { - char* okSlot=0; + const char* okSlot=0; #ifdef Q_OS_WIN if ( sndSystem==PULSE ) { -- Alioth's /srv/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 master in repository x2goclient. commit 36657f76b56aed53b529798ac0b9f7b535415665 Author: Mike DePaulo <mikedep333@gmail.com> Date: Mon Dec 1 08:20:35 2014 -0500 Apply add-libraries-to-build-with-VS2010-command-line.patch from George Trakatelis (uom.edu.gr) --- x2goclient.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x2goclient.pro b/x2goclient.pro index 1c3ead1..10f1144 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -121,6 +121,7 @@ SOURCES += sharewidget.cpp \ folderexplorer.cpp LIBS += -lssh +win32:LIBS += -lAdvAPI32 -lshell32 -lUser32 plugin { TARGET = x2goplugin @@ -135,7 +136,7 @@ else { !isEmpty(TRANSLATIONS) { isEmpty(QMAKE_LRELEASE) { - win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease } -- Alioth's /srv/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 master in repository x2goclient. commit 8707629a1c89761934852e7813f1f9ce25303466 Author: Mike DePaulo <mikedep333@gmail.com> Date: Mon Dec 1 08:21:46 2014 -0500 Apply conform-to-stricter-type-checking-VS2010-close-socket.patch from George Trakatelis (uom.edu.gr) (Fixes: #642) --- sshmasterconnection.cpp | 9 ++++++--- wapi.cpp | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index c3f78d7..519548f 100755 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -104,10 +104,10 @@ void SshMasterConnection::parseKnownHosts() for (int i=0; i<bytes.count();) { int size=0; - //first 4 bytes are for size of data fild (big-endian) + //first 4 bytes are for size of data field (big-endian) for (int j=0; j<4; ++j) { - size+=((uchar)(bytes[i])) * pow(256,3-j); + size+=((uchar)(bytes[i])) * pow((float)256,3-j); i++; } QByteArray data; @@ -1674,8 +1674,11 @@ void SshMasterConnection::finalize ( int item ) { #ifndef Q_OS_WIN shutdown(tcpSocket, SHUT_RDWR); -#endif close ( tcpSocket ); +#else + shutdown(tcpSocket, SD_BOTH); + closesocket ( tcpSocket ); +#endif } SshProcess* proc=channelConnections[item].creator; QString uuid=channelConnections[item].uuid; diff --git a/wapi.cpp b/wapi.cpp index f167669..f0972d7 100644 --- a/wapi.cpp +++ b/wapi.cpp @@ -22,6 +22,7 @@ #endif #include "x2goclientconfig.h" #ifdef Q_OS_WIN +#include <winsock2.h> #include <windows.h> #include <sddl.h> #include "wapi.h" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org