Skip to content

N
nx-libs
Commit db4c220b authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

nxagent: add NXAGENT_ONSTART where missing

There were some locations referenceing a variable that was only availabe with NXAGENT_ONSTART set
parent 0f5e873d
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
View file @ db4c220b
...@@ -141,7 +141,9 @@ void nxagentWaitDisplay(void); ...@@ -141,7 +141,9 @@ void nxagentWaitDisplay(void);
void nxagentListRemoteFonts(const char *, int); void nxagentListRemoteFonts(const char *, int);
#ifdef NXAGENT_ONSTART
unsigned int nxagentWMtimeout = 0; unsigned int nxagentWMtimeout = 0;
#endif
Bool nxagentWMPassed = False; Bool nxagentWMPassed = False;
/* /*
......
nx-X11/programs/Xserver/hw/nxagent/Splash.c
View file @ db4c220b
...@@ -72,7 +72,9 @@ static void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height ...@@ -72,7 +72,9 @@ static void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height
* From Screen.c. * From Screen.c.
*/ */
#ifdef NXAGENT_ONSTART
extern Atom nxagentReadyAtom; extern Atom nxagentReadyAtom;
#endif
/* /*
* From Clipboard.c. * From Clipboard.c.
...@@ -106,7 +108,9 @@ void nxagentShowSplashWindow(Window parentWindow) ...@@ -106,7 +108,9 @@ void nxagentShowSplashWindow(Window parentWindow)
} }
#endif #endif
#ifdef NXAGENT_ONSTART
XSetSelectionOwner(nxagentDisplay, nxagentReadyAtom, None, CurrentTime); XSetSelectionOwner(nxagentDisplay, nxagentReadyAtom, None, CurrentTime);
#endif
nxagentWMPassed = False; nxagentWMPassed = False;
...@@ -401,8 +405,10 @@ void nxagentRemoveSplashWindow(void) ...@@ -401,8 +405,10 @@ void nxagentRemoveSplashWindow(void)
if (!nxagentWMPassed) if (!nxagentWMPassed)
{ {
#ifdef NXAGENT_ONSTART
XSetSelectionOwner(nxagentDisplay, nxagentReadyAtom, XSetSelectionOwner(nxagentDisplay, nxagentReadyAtom,
nxagentDefaultWindows[0], CurrentTime); nxagentDefaultWindows[0], CurrentTime);
#endif
nxagentWMPassed = True; nxagentWMPassed = True;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment