aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-16 12:38:53 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:27:00 +0200
commitbd002ffc51350dab01b188fdabbdcf6218497956 (patch)
tree0a3d05a15dc76033e03697dd6c153ed89a415b13
parent5bb5adc8a137833db7c6cba3ba1bc2f25960b048 (diff)
downloadnx-libs-bd002ffc51350dab01b188fdabbdcf6218497956.tar.gz
nx-libs-bd002ffc51350dab01b188fdabbdcf6218497956.tar.bz2
nx-libs-bd002ffc51350dab01b188fdabbdcf6218497956.zip
Splash.c: move some variables to Splash.c
They belong there...
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.c3
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);
/*