aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-16 12:46:21 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:27:00 +0200
commit784846317f89d9fb9a4bfefffcc914a8895b231f (patch)
treecf572902e36a16c801ee1f97d8fa5df5d1f496b6
parentbd002ffc51350dab01b188fdabbdcf6218497956 (diff)
downloadnx-libs-784846317f89d9fb9a4bfefffcc914a8895b231f.tar.gz
nx-libs-784846317f89d9fb9a4bfefffcc914a8895b231f.tar.bz2
nx-libs-784846317f89d9fb9a4bfefffcc914a8895b231f.zip
nxagent: rename nxagentWMStart to nxagentReadyAtom
This better reflects its purpose: Tell listeners we are ready.
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.c6
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;