This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 60be3ad99ad61b09c9741f75954dff793c045ed8 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri Aug 21 10:47:15 2020 -0500 set clipboard mode of x2gokdriveclient in cmd line option. --- debian/changelog | 1 + src/onmainwindow.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 335cf90..2240a50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - Client can synchronize sessions with broker. Broker need to send syncinterval value in the client config section. - Set min width of session status label. + - set clipboard mode of x2gokdriveclient in cmd line option. [ Ryan Schmidt ] * New upstream version (4.1.2.3): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index f570967..2df52dd 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -6149,6 +6149,7 @@ void ONMainWindow::slotTunnelOk(int) QString height; bool multidisp=false; QString dispNumber="1"; + QString clipboard="both"; if (!embedMode ) { @@ -6177,6 +6178,9 @@ void ONMainWindow::slotTunnelOk(int) width=st->setting()->value ( sid+"/width", ( QVariant ) "800").toString(); height=st->setting()->value ( sid+"/height", ( QVariant ) "600").toString(); + clipboard=st->setting()->value ( sid+"/clipboard", ( QVariant ) "both").toString(); + + if (st->setting()->value ( sid+"/multidisp", ( QVariant ) false ).toBool()) @@ -6196,7 +6200,7 @@ void ONMainWindow::slotTunnelOk(int) #endif proxyCmd="x2gokdriveclient"; options<<"--connect"<<"localhost"<<"--port"<<localGraphicPort<<"--title"<<resumingSession.sessionId<<"-S"<<"nx/nx,options="+dirpath+ - "/options:"+resumingSession.display; + "/options:"+resumingSession.display<<"--selection"<<clipboard; if(randr) { options<<"--randr"; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git