[X2Go-Commits] [x2goclient] 02/04: src/onmainwindow.cpp: print out current DISPLAY value in debug log while starting X server.
git-admin at x2go.org
git-admin at x2go.org
Sat May 12 00:38:12 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 15c5b017fa6ef22a39a5f031c81bc6ba84dcb836
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri May 11 23:19:11 2018 +0200
src/onmainwindow.cpp: print out current DISPLAY value in debug log while starting X server.
---
debian/changelog | 2 ++
src/onmainwindow.cpp | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b1b6318..a45b70f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium
- src/onmainwindow.cpp: add -nopn parameter to VcXsrv startup options,
making the binary fail if it wasn't able to bind the requested port on
all addresses.
+ - src/onmainwindow.cpp: print out current DISPLAY value in debug log while
+ starting X.Org Server on Windows.
* x2goclient.spec:
- Remove plugin references.
* debian/rules:
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index bef04f5..53cf24d 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10040,6 +10040,7 @@ void ONMainWindow::startXOrg ()
x2goDebug<<"Running "<<exec<<" "<<args.join(" ");
+ x2goDebug << "Trying to start X.Org Server on DISPLAY: " << xDisplay;
xorg->start ( exec, args );
@@ -10067,8 +10068,7 @@ void ONMainWindow::slotCheckXOrgConnection()
++waitingForX;
if (isServerRunning(6000+xDisplay))
{
-
- x2goDebug<<"X.Org Server started.";
+ x2goDebug<<"X.Org Server started on DISPLAY " << xDisplay << ".";
slotSetWinServersReady();
}
--
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