[X2Go-Commits] [nx-libs] 169/219: Splash.c: nxagentRemoveSplashWindow: drop unused parameter

[git-admin at x2go.org]

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 be508a447be199b24a3bb856adb64a6fbd016e9e
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Thu Aug 15 22:04:07 2019 +0200

    Splash.c: nxagentRemoveSplashWindow: drop unused parameter
---
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 4 ++--
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c  | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c     | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Splash.c     | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Splash.h     | 3 +--
 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 b78c01e30..c56d74236 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -681,7 +681,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 5cdb50f90..2355e5b61 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -3122,7 +3122,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__ */

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git