This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 784846317f89d9fb9a4bfefffcc914a8895b231f Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Aug 16 12:46:21 2019 +0200 nxagent: rename nxagentWMStart to nxagentReadyAtom This better reflects its purpose: Tell listeners we are ready. --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Splash.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 1298dc9ea..27f72d566 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -146,7 +146,7 @@ Window nxagentInputWindows[MAXSCREENS]; Window nxagentScreenSaverWindows[MAXSCREENS]; #ifdef NXAGENT_ONSTART -Atom nxagentWMStart; +Atom nxagentReadyAtom; #endif ScreenPtr nxagentDefaultScreen = NULL; @@ -927,7 +927,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, nxagentQueryAtoms(pScreen); #ifdef NXAGENT_ONSTART - nxagentWMStart = nxagentAtoms[3]; /* WM_NX_READY */ + nxagentReadyAtom = nxagentAtoms[3]; /* WM_NX_READY */ #endif /* diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c index 28c5599af..c3f6f101e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c @@ -72,7 +72,7 @@ static void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height * From Screen.c. */ -extern Atom nxagentWMStart; +extern Atom nxagentReadyAtom; /* * From Clipboard.c. @@ -106,7 +106,7 @@ void nxagentShowSplashWindow(Window parentWindow) } #endif - XSetSelectionOwner(nxagentDisplay, nxagentWMStart, None, CurrentTime); + XSetSelectionOwner(nxagentDisplay, nxagentReadyAtom, None, CurrentTime); nxagentWMPassed = False; @@ -401,7 +401,7 @@ void nxagentRemoveSplashWindow(void) if (!nxagentWMPassed) { - XSetSelectionOwner(nxagentDisplay, nxagentWMStart, + XSetSelectionOwner(nxagentDisplay, nxagentReadyAtom, nxagentDefaultWindows[0], CurrentTime); nxagentWMPassed = True; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git