This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 3a1369e8d22a04a841add6df43c70469c012391b Author: Mihai Moldovan <ionic@ionic.de> Date: Thu May 24 10:46:22 2018 +0200 src/onmainwindow.cpp: re-add periodic xmodmap keyboard sync for OS X/macOS platforms. Was dropped some time ago by accident. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ed742d..00e97d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -72,6 +72,8 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.cpp: add -silent-dup-error parameter to VcXsrv startup options, forcing it to silently fail without showing a dialog and thus keeping the process running. + - src/onmainwindow.cpp: re-add periodic xmodmap keyboard sync for OS + X/macOS platforms. Was dropped some time ago by accident. * x2goclient.spec: - Remove plugin references. * debian/rules: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 6be2ed2..a3635fc 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -5986,13 +5986,18 @@ void ONMainWindow::slotSetModMap() } } } - - /* Send modified map to server. */ - QString cmd = "export DISPLAY=\":" + resumingSession.display + "\"; echo \"" + kbMap + "\" | xmodmap -"; - sshConnection->executeCommand (cmd); } } } + + if (kbMap.empty ()) { + x2goWarningf (9) << "Could not fetch keyboard map via xmodmap. Internal error. Not synchronizing with remote side."; + } + else { + /* Send modified map to server. */ + QString cmd = "export DISPLAY=\":" + resumingSession.display + "\"; echo \"" + kbMap + "\" | xmodmap -"; + sshConnection->executeCommand (cmd); + } } void ONMainWindow::handle_xmodmap_error (QProcess &proc) { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git