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 bd002ffc51350dab01b188fdabbdcf6218497956 Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Aug 16 12:38:53 2019 +0200 Splash.c: move some variables to Splash.c They belong there... --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 -- nx-X11/programs/Xserver/hw/nxagent/Splash.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 111a3fdaa..1298dc9ea 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -147,8 +147,6 @@ Window nxagentScreenSaverWindows[MAXSCREENS]; #ifdef NXAGENT_ONSTART Atom nxagentWMStart; -Window nxagentSplashWindow = None; -Pixmap nxagentPixmapLogo; #endif ScreenPtr nxagentDefaultScreen = NULL; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c index 2945717c4..28c5599af 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c @@ -63,6 +63,9 @@ #define nxagentLogoDarkGray 0x222222 #define nxagentLogoLightGray 0xbbbbbb +Pixmap nxagentPixmapLogo; +Window nxagentSplashWindow = None; + static void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height); /* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git