Commit f323ada3 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

nxagent: move atom initiatialization to Init.c

It is not dependent on any root window and needs only be called once on startup.
parent 4fa0ea26
...@@ -71,6 +71,7 @@ is" without express or implied warranty. ...@@ -71,6 +71,7 @@ is" without express or implied warranty.
#include "Millis.h" #include "Millis.h"
#include "Error.h" #include "Error.h"
#include "Keystroke.h" #include "Keystroke.h"
#include "Atoms.h"
#include <nx/NX.h> #include <nx/NX.h>
#include "compext/Compext.h" #include "compext/Compext.h"
...@@ -414,6 +415,8 @@ FIXME: These variables, if not removed at all because have probably ...@@ -414,6 +415,8 @@ FIXME: These variables, if not removed at all because have probably
#ifdef NXAGENT_CLIPBOARD #ifdef NXAGENT_CLIPBOARD
AddCallback(&SelectionCallback, nxagentSetSelectionCallback, NULL); AddCallback(&SelectionCallback, nxagentSetSelectionCallback, NULL);
#endif #endif
nxagentInitAtoms();
} }
void void
......
...@@ -106,7 +106,6 @@ Equipment Corporation. ...@@ -106,7 +106,6 @@ Equipment Corporation.
#include "Screen.h" #include "Screen.h"
#include "Options.h" #include "Options.h"
#include "Atoms.h"
#include "Clipboard.h" #include "Clipboard.h"
#include "Splash.h" #include "Splash.h"
#include "Rootless.h" #include "Rootless.h"
...@@ -204,8 +203,6 @@ InitRootWindow(WindowPtr pWin) ...@@ -204,8 +203,6 @@ InitRootWindow(WindowPtr pWin)
fprintf(stderr, "InitRootWindow: Mapping default windows.\n"); fprintf(stderr, "InitRootWindow: Mapping default windows.\n");
#endif #endif
nxagentInitAtoms();
nxagentInitClipboard(pWin); nxagentInitClipboard(pWin);
nxagentMapDefaultWindows(); nxagentMapDefaultWindows();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment