diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-11-04 13:38:30 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-11-04 13:38:30 +0100 |
| commit | 48b914810291f405fd5ba8e9db9dfab3ccaf906c (patch) | |
| tree | df51d615805d20fd43cb66e58d7123abce90a225 /nx-X11/programs/Xserver/hw/nxagent/Atoms.c | |
| parent | 6cd4f12322ffccdbbfa10ce9e282e54a932b995c (diff) | |
| parent | 252b86ee23cf110e7aef2c3605c5be7ff1cd5a69 (diff) | |
| download | nx-libs-48b914810291f405fd5ba8e9db9dfab3ccaf906c.tar.gz nx-libs-48b914810291f405fd5ba8e9db9dfab3ccaf906c.tar.bz2 nx-libs-48b914810291f405fd5ba8e9db9dfab3ccaf906c.zip | |
Merge branch 'uli42-pr/various5' into 3.6.x
Attributes GH PR #963: https://github.com/ArcticaProject/nx-libs/pull/963
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Atoms.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c index 358d46519..52c75e805 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c @@ -42,7 +42,6 @@ #include "Display.h" #include "Screen.h" #include "Options.h" -#include "Agent.h" #include "Utils.h" /* @@ -709,7 +708,7 @@ XlibAtom nxagentLocalToRemoteAtom(Atom local) if (current->string) fprintf(stderr, "%s: local [%d] -> remote [%d (%s)]\n", __func__, local, current->remote, current->string); else - fprintf(stderr, "%s: local [%d] -> remote [%d]\n", __func__, local, current->remote); + fprintf(stderr, "%s: local [%d] -> remote [%d] (no string cached)\n", __func__, local, current->remote); #endif return current->remote; @@ -718,7 +717,7 @@ XlibAtom nxagentLocalToRemoteAtom(Atom local) { const char *string = NameForAtom(local); - /* FIXME: why False? */ + /* False means "create Atom if it does not exist yet" */ XlibAtom remote = XInternAtom(nxagentDisplay, string, False); if (remote == None) |