This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 456a43f Fix loading session icon to system tray when using broker. new 755feb8 Add --debug argument to x2gokdriveclient in debug mode. new 94b150b Setting debug filter rules for QT>=5.2 The 2 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: debian/changelog | 2 ++ src/onmainwindow.cpp | 12 ++++++++++++ 2 files changed, 14 insertions(+) -- Alioth's /home/x2go-admin/maintenancescripts/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 755feb8128b95b84c5d5c90697b1a956dae33398 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri Sep 17 13:41:05 2021 +0200 Add --debug argument to x2gokdriveclient in debug mode. --- debian/changelog | 1 + src/onmainwindow.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1148578..e7ca958 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - Don't exit if connection to HTTP broker is failed when sync sessions. - Support for HTTP(S) urls in the session icons when using http broker. - Fix loading session icon to system tray when using broker. + - Add --debug argument to x2gokdriveclient in debug mode. [ Ryan Schmidt ] * New upstream version (4.1.2.3): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 7918a26..b0b418c 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -6243,6 +6243,10 @@ void ONMainWindow::slotTunnelOk(int) dirpath=nxroot+"/S-"+resumingSession.sessionId; #endif proxyCmd="x2gokdriveclient"; + if(ONMainWindow::debugging) + { + options <<"--debug"; + } options<<"--connect"<<"localhost"<<"--port"<<localGraphicPort<<"--title"<<resumingSession.sessionId<<"-S"<<"nx/nx,options="+dirpath+ "/options:"+resumingSession.display<<"--selection"<<clipboard; if(randr) -- Alioth's /home/x2go-admin/maintenancescripts/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 94b150b7271fc035805acb95667bfe6f9e39601f Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri Sep 17 13:49:45 2021 +0200 Setting debug filter rules for QT>=5.2 --- debian/changelog | 1 + src/onmainwindow.cpp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index e7ca958..ed4343b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - Support for HTTP(S) urls in the session icons when using http broker. - Fix loading session icon to system tray when using broker. - Add --debug argument to x2gokdriveclient in debug mode. + - Setting debug filter rules for QT>=5.2 [ Ryan Schmidt ] * New upstream version (4.1.2.3): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index b0b418c..f1febcb 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -21,6 +21,11 @@ #include <QStyleFactory> +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) +#include <QLoggingCategory> +#endif + + void x2goSession::operator = ( const x2goSession& s ) { agentPid=s.agentPid; @@ -7767,6 +7772,9 @@ bool ONMainWindow::parseParameter ( QString param ) if (param == "--debug") { ONMainWindow::debugging = true; +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + QLoggingCategory::setFilterRules("default.debug=true"); +#endif return true; } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org