aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-11 01:51:37 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:12:24 +0200
commit3c92d88973f18ff89b9d039ff51370650a2d0ef4 (patch)
tree3b80846a057149333050614696907b38bb1ecb8f /nx-X11/programs/Xserver/hw/nxagent
parent470e0bd4d998e9c84e6f58736c7eb510c6223efd (diff)
downloadnx-libs-3c92d88973f18ff89b9d039ff51370650a2d0ef4.tar.gz
nx-libs-3c92d88973f18ff89b9d039ff51370650a2d0ef4.tar.bz2
nx-libs-3c92d88973f18ff89b9d039ff51370650a2d0ef4.zip
Splash.c: drop return code of nxagentShowSplashWindow
nobody was checking it.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.c6
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.h2
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);