This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 39d369276aff1348108c239825626fac89190949 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Tue Jan 19 11:30:40 2021 -0600 X2Go Client will send it's version to the broker when sending client event. --- debian/changelog | 1 + src/httpbrokerclient.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7b94f93..4203e36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - Fix maximizing client window in thinclient mode with Qt5 (bullseye). - Add mime type application/x-x2go. X2Go Client can now automatically open session files with .x2go extension. + - X2Go Client will send it's version to the broker when sending client event. [ Ryan Schmidt ] * New upstream version (4.1.2.3): diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp index f61bfce..76de2d2 100644 --- a/src/httpbrokerclient.cpp +++ b/src/httpbrokerclient.cpp @@ -38,6 +38,7 @@ #include <QInputDialog> #include "InteractionDialog.h" #include <QStatusBar> +#include "version.h" HttpBrokerClient::HttpBrokerClient ( ONMainWindow* wnd, ConfigFile* cfg ) @@ -386,6 +387,7 @@ void HttpBrokerClient::sendEvent(const QString& ev, const QString& id, const QSt "display="<<QUrl::toPercentEncoding(display)<<"&"<< "start="<<QUrl::toPercentEncoding(start)<<"&"<< "elapsed="<<QString::number(connectionTime)<<"&"<< + "version="<<QUrl::toPercentEncoding(VERSION)<<"&"<< "authid="<<nextAuthId; x2goDebug << "sending request: "<< scramblePwd(req.toUtf8()); QNetworkRequest request(QUrl(config->brokerurl)); @@ -398,12 +400,12 @@ void HttpBrokerClient::sendEvent(const QString& ev, const QString& id, const QSt if (nextAuthId.length() > 0) { sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+nextAuthId+ " --task clientevent --sid \""+id+"\" --event "+ev+" --server \""+server+"\" --client \""+client+"\" --login "+"\""+ - login+"\" --cmd \""+cmd+"\" --display \""+display+"\" --start \""+start+"\" --elapsed "+QString::number(connectionTime), + login+"\" --cmd \""+cmd+"\" --display \""+display+"\" --start \""+start+"\" --elapsed "+QString::number(connectionTime)+" --version \""+VERSION+"\"", this,SLOT ( slotEventSent(bool,QString,int))); } else { sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser + " --task clientevent --sid \""+id+"\" --event "+ev+" --server \""+server+"\" --client \""+client+"\" --login "+"\""+ - login+"\" --cmd \""+cmd+"\" --display \""+display+"\" --start \""+start+"\" --elapsed "+QString::number(connectionTime), + login+"\" --cmd \""+cmd+"\" --display \""+display+"\" --start \""+start+"\" --elapsed "+QString::number(connectionTime)+" --version \""+VERSION+"\"", this,SLOT ( slotEventSent(bool,QString,int))); } } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git