aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-09-05 20:47:15 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-09-29 17:15:25 +0200
commitf323ada3c631b73c319ff53119aae9d18e1dbf7a (patch)
tree52053e526d5bbe9eeca8dfddabfe3b3f3c995608 /nx-X11/programs
parent4fa0ea268bf77726c15dfe75810d25004b623183 (diff)
downloadnx-libs-f323ada3c631b73c319ff53119aae9d18e1dbf7a.tar.gz
nx-libs-f323ada3c631b73c319ff53119aae9d18e1dbf7a.tar.bz2
nx-libs-f323ada3c631b73c319ff53119aae9d18e1dbf7a.zip
nxagent: move atom initiatialization to Init.c
It is not dependent on any root window and needs only be called once on startup.
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Init.c3
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXwindow.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index a7338e49f..0b4ffd601 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -71,6 +71,7 @@ is" without express or implied warranty.
#include "Millis.h"
#include "Error.h"
#include "Keystroke.h"
+#include "Atoms.h"
#include <nx/NX.h>
#include "compext/Compext.h"
@@ -414,6 +415,8 @@ FIXME: These variables, if not removed at all because have probably
#ifdef NXAGENT_CLIPBOARD
AddCallback(&SelectionCallback, nxagentSetSelectionCallback, NULL);
#endif
+
+ nxagentInitAtoms();
}
void
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
index ec4166f07..88e68e463 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
@@ -106,7 +106,6 @@ Equipment Corporation.
#include "Screen.h"
#include "Options.h"
-#include "Atoms.h"
#include "Clipboard.h"
#include "Splash.h"
#include "Rootless.h"
@@ -204,8 +203,6 @@ InitRootWindow(WindowPtr pWin)
fprintf(stderr, "InitRootWindow: Mapping default windows.\n");
#endif
- nxagentInitAtoms();
-
nxagentInitClipboard(pWin);
nxagentMapDefaultWindows();