This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdriveclient. from 907397e revert to sprintf function for correct background in menuframe.cpp. new f040b3b output some important messages if not running in debug mode. The 1 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: client.cpp | 25 ++++++++++++------------- debian/changelog | 1 + 2 files changed, 13 insertions(+), 13 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdriveclient. commit f040b3b698199cbb8c5ba766b30cdd45a49e7b5f Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Oct 20 11:27:03 2021 -0500 output some important messages if not running in debug mode. --- client.cpp | 25 ++++++++++++------------- debian/changelog | 1 + 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client.cpp b/client.cpp index dc141d0..7817970 100644 --- a/client.cpp +++ b/client.cpp @@ -847,7 +847,7 @@ void Client::getServerversion() serverVersion=*((uint16_t*)messageBuffer+2); serverExtSelection = (serverVersion>1); - KDRStdErr()<<"server version: "<<serverVersion; + KDRStdErr(false)<<"server version: "<<serverVersion<<KDR_ENDL; initGeometry(); } @@ -1350,26 +1350,25 @@ void Client::dataArrived() void Client::socketConnected() { displayArea->setStyleSheet("QFrame#DisplayArea{background-color:black;}"); - KDRStdErr()<<"Connected to server"; - KDRStdErr(false)<<"Established X server connection"; + KDRStdErr(false)<<"Connected to server"<<KDR_ENDL<<"Established X server connection"<<KDR_ENDL; if(cookie.length()) { if(cookie.length()!=32) { - KDRStdErr()<<"Wrong length of cookie should be 32, not "<<cookie.length(); + KDRStdErr(false)<<"Wrong length of cookie should be 32, not "<<cookie.length()<<KDR_ENDL; exitOnError(tr("Wrong cookie length")); } KDRStdErr()<<"Sending Cookie to server"; if(clientSocket->write(cookie.toLatin1().data(), 32)!=32) { - KDRStdErr()<<"Failed to send auth cookie to server"; + KDRStdErr(false)<<"Failed to send auth cookie to server"<<KDR_ENDL; exitOnError(tr("Failed to send auth cookie to server")); } } else { - KDRStdErr()<<"Not sending cookie to server"; + KDRStdErr(false)<<"Not sending cookie to server"<<KDR_ENDL; } connected=true; @@ -1383,7 +1382,7 @@ void Client::checkServerVersion() { if(!serverVersion) { - KDRStdErr()<<"Server Version is 0, please update your x2gokdrive package"; + KDRStdErr(false)<<"Server Version is 0, please update your x2gokdrive package"<<KDR_ENDL; //if the server bversion is 0, we didn't init the geometry yet initGeometry(); } @@ -1409,7 +1408,7 @@ void Client::initGeometry() void Client::socketDisconnected() { connected=false; - KDRStdErr()<<"Disconnected from Server"; + KDRStdErr(false)<<"Disconnected from Server"<<KDR_ENDL; QApplication::closeAllWindows(); close(); QApplication::exit(0); @@ -1417,7 +1416,7 @@ void Client::socketDisconnected() void Client::socketError(QAbstractSocket::SocketError ) { - KDRStdErr()<<clientSocket->errorString(); + KDRStdErr(false)<<clientSocket->errorString()<<KDR_ENDL; exitOnError(clientSocket->errorString()); } @@ -1548,7 +1547,7 @@ void Client::sendClientVersion() memcpy(evmsg,(char*)&etype,4); memcpy(evmsg+4,(char*)&version,2); memcpy(evmsg+6,(char*)&os,2); - KDRStdErr()<<"Sending version: "<<version<<" OS: "<<os; + KDRStdErr(false)<<"Sending version: "<<version<<" OS: "<<os<<KDR_ENDL; sendEvent(evmsg); } @@ -1769,7 +1768,7 @@ void Client::sendSelectionToServer(SelectionType selection) if(!data.size()) { - KDRStdErr()<<"no data"; + KDRStdErr(false)<<"no data"<<KDR_ENDL; return; } @@ -1885,13 +1884,13 @@ void Client::requestCacheRebuild() uint32_t etype; etype=CACHEREBUILD; memcpy(evmsg,(char*)&etype,4); - KDRStdErr()<<"Requesting cache rebuild"; + KDRStdErr(false)<<"Requesting cache rebuild"<<KDR_ENDL; sendEvent(evmsg); } void Client::reinitCaches() { - KDRStdErr()<<"Clearing all caches"; + KDRStdErr(false)<<"Clearing all caches"<<KDR_ENDL; cursorCache.clear(); frameCache.clear(); wantRepaint=false; diff --git a/debian/changelog b/debian/changelog index 58f80f0..09ea55b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,5 +38,6 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - use Qt::endl and Qt::hex in Qt >= 5.15 and endl and hex otherwise. - use KDR_ENDL in destructor. - revert to sprintf function for correct background in menuframe.cpp. + - output some important messages if not running in debug mode. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Jun 2019 11:10:43 +0200 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
-
git-admin＠x2go.org