[X2Go-Commits] [x2goclient] 01/01: src/onmainwindow.cpp: fix compile error on OS X/macOS.
git-admin at x2go.org
git-admin at x2go.org
Thu May 24 10:53:52 CEST 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 5fed0ac9a5d33dc54bbf741cd8c8a6884d97b3ba
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu May 24 10:53:46 2018 +0200
src/onmainwindow.cpp: fix compile error on OS X/macOS.
---
debian/changelog | 1 +
src/onmainwindow.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 00e97d6..855dcac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,7 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium
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.
+ - src/onmainwindow.cpp: fix compile error on OS X/macOS.
* x2goclient.spec:
- Remove plugin references.
* debian/rules:
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index a3635fc..fd4951b 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5990,7 +5990,7 @@ void ONMainWindow::slotSetModMap()
}
}
- if (kbMap.empty ()) {
+ if (kbMap.isEmpty ()) {
x2goWarningf (9) << "Could not fetch keyboard map via xmodmap. Internal error. Not synchronizing with remote side.";
}
else {
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list