[X2Go-Commits] [nx-libs] 167/219: Splash.c: drop return code of nxagentShowSplashWindow

[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 3c92d88973f18ff89b9d039ff51370650a2d0ef4
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sun Aug 11 01:51:37 2019 +0200

    Splash.c: drop return code of nxagentShowSplashWindow
    
    nobody was checking it.
---
 nx-X11/programs/Xserver/hw/nxagent/Splash.c | 6 ++----
 nx-X11/programs/Xserver/hw/nxagent/Splash.h | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
index e2e88674b..387c859ae 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
@@ -78,7 +78,7 @@ extern Atom nxagentWMStart;
 
 extern Atom serverCutProperty;
 
-int nxagentShowSplashWindow(Window parentWindow)
+void nxagentShowSplashWindow(Window parentWindow)
 {
   XWindowAttributes getAttributes;
   XWindowChanges    values;
@@ -89,7 +89,7 @@ int nxagentShowSplashWindow(Window parentWindow)
    * Show splash window only when running as X2Go Agent
    */
   if(!nxagentX2go)
-    return False;
+    return;
 
   #ifdef TEST
   fprintf(stderr, "nxagentShowSplashWindow: Got called.\n");
@@ -172,8 +172,6 @@ int nxagentShowSplashWindow(Window parentWindow)
             GetTimeInMillis() - startTime);
   }
   #endif
-
-  return True;
 }
 
 void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.h b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
index 444f1eed0..2057390fc 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
@@ -47,7 +47,7 @@ extern Window nxagentSplashWindow;
 
 extern int nxagentWMPassed;
 
-extern int nxagentShowSplashWindow(Window);
+extern void nxagentShowSplashWindow(Window);
 
 extern void nxagentRemoveSplashWindow(WindowPtr pWin);
 

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