This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 11110ba6d45fe6fa0edad5b1d10c96ae810fc672 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri Jul 22 11:51:50 2022 -0500 send to broker xdmcpserver in command option when starting xdmcp session. --- debian/changelog | 1 + src/onmainwindow.cpp | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8a01df9..444d302 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - replace <HOME> with user's home dir in exports directories, when exporting session default directories. - create default export directory if not exists. + - send to broker xdmcpserver in command option when starting xdmcp session. [ Ryan Schmidt ] * New upstream version (4.1.2.3): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 329895b..c5ea26c 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -4306,6 +4306,13 @@ void ONMainWindow::sendEventToBroker(ONMainWindow::client_events ev) break; } } + QString sid=sessionExplorer->getLastSession()->id(); + X2goSettings st(config.iniFile, QSettings::IniFormat); + if(st.setting()->value ( sid+"/command", ( QVariant ) defaultCmd ).toString()=="XDMCP") + { + resumingSession.command="XDMCP-"+st.setting()->value ( sid+"/xdmcpserver").toString(); + } + broker->sendEvent(event, resumingSession.sessionId,resumingSession.server, resumingSession.clientIp, getCurrentUname(), resumingSession.command, resumingSession.display, resumingSession.crTime, QDateTime::currentDateTime().toTime_t()-resumingSession.connectedSince); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git