The branch, master has been updated via f9f9efef4450485b53cf43100d1ad14ea8f96b16 (commit) from 3b20e0e71cf3c01b1f73ecee2014c4ddf5c07a3f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f9f9efef4450485b53cf43100d1ad14ea8f96b16 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 29 16:56:38 2012 +0100 Properly set DISPLAY environment variable on Mac OS X. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + onmainwindow_part2.cpp | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 534c2d9..d9bcfaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low especially when using tcp_wrappers with the identd option turned on. Wait for a 60 seconds timeout. - On Mac OS X connect to Xserver via Unix file socket. + - Properly set DISPLAY environment variable on Mac OS X. [ Daniel Lindgren ] * New upstream version (3.99.1.1): diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp index f43c179..e8df279 100644 --- a/onmainwindow_part2.cpp +++ b/onmainwindow_part2.cpp @@ -1900,12 +1900,17 @@ void ONMainWindow::slotTunnelOk() env << "NX_CLIENT="+QCoreApplication::applicationFilePath (); #if defined ( Q_OS_WIN ) || defined ( Q_OS_DARWIN ) + // On Mac OS X, we want to make sure that DISPLAY is set to a proper value, + // but at the same time don't want to set the value ourselves but keep + // the provided one. QString disp=getXDisplay(); if ( disp==QString::null ) { //slotProxyerror ( QProcess::FailedToStart ); return; } +#endif // Q_OS_WIN || Q_OS_DARWIN +#if defined ( Q_OS_WIN ) if ( dispInd==-1 ) { env <<"DISPLAY=localhost:"+disp; @@ -1917,8 +1922,8 @@ void ONMainWindow::slotTunnelOk() /* x2goDebug<<"existing env DISPLAY("<<dispInd<< ") DISPLAY=localhost:"+disp<<endl;*/ } -#endif -#ifdef Q_OS_DARWIN +#endif // Q_OS_WIN +#if defined ( Q_OS_DARWIN ) //setting /usr/X11/bin to find xauth env.insert ( 0, hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).