aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Reconnect.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.h3
5 files changed, 6 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index 339994e6c..7020a679e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -380,7 +380,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
if (!nxagentWMPassed && (nxagentWMtimeout < currentDispatch))
{
- nxagentRemoveSplashWindow(NULL);
+ nxagentRemoveSplashWindow();
}
nxagentClients = nClients;
@@ -590,7 +590,7 @@ ProcReparentWindow(register ClientPtr client)
if (!nxagentWMPassed)
{
- nxagentRemoveSplashWindow(pWin);
+ nxagentRemoveSplashWindow();
}
pParent = (WindowPtr)SecurityLookupWindow(stuff->parent, client,
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 47f636316..e29fc3200 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -680,7 +680,7 @@ Bool nxagentReconnectSession(void)
#endif
saveAgentState("RUNNING");
- nxagentRemoveSplashWindow(NULL);
+ nxagentRemoveSplashWindow();
/*
* We let the proxy flush the link on our behalf
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 8d578c084..111a3fdaa 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -3108,7 +3108,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
{
if (!nxagentWMPassed)
{
- nxagentRemoveSplashWindow(NULL);
+ nxagentRemoveSplashWindow();
}
NXShadowExportChanges(&numRects, &ptBox);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
index e983048eb..74322648a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
@@ -378,7 +378,7 @@ void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height)
#endif
}
-void nxagentRemoveSplashWindow(WindowPtr pWin)
+void nxagentRemoveSplashWindow(void)
{
if (nxagentReconnectTrap)
return;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.h b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
index 2057390fc..52adbc340 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
@@ -48,7 +48,6 @@ extern Window nxagentSplashWindow;
extern int nxagentWMPassed;
extern void nxagentShowSplashWindow(Window);
-
-extern void nxagentRemoveSplashWindow(WindowPtr pWin);
+extern void nxagentRemoveSplashWindow();
#endif /* __Splash_H__ */