diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 23:50:21 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 23:50:21 +0100 |
commit | e89fb895a25004496b7dde4aec5fd7574baf6f25 (patch) | |
tree | 9f7decd9b6ebc4d922648ae4bb8633398b57d256 /nx-X11/programs/Xserver/hw/nxagent/Atoms.c | |
parent | 057ce728fcb43e6b91a54f98f6f6d9ed8fe680a6 (diff) | |
parent | 30fb45b2a65aa8cf1a544339b1288119319de455 (diff) | |
download | nx-libs-e89fb895a25004496b7dde4aec5fd7574baf6f25.tar.gz nx-libs-e89fb895a25004496b7dde4aec5fd7574baf6f25.tar.bz2 nx-libs-e89fb895a25004496b7dde4aec5fd7574baf6f25.zip |
Merge branch 'uli42-pr/more_clipboard_improvements' into 3.6.x
Attributes GH PR #877: https://github.com/ArcticaProject/nx-libs/pull/877
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Atoms.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c index 6bd945de7..4e9b7fb1f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c @@ -81,6 +81,9 @@ static char *nxagentAtomNames[NXAGENT_NUMBER_OF_ATOMS + 1] = "WM_NX_READY", /* 3 */ "MCOPGLOBALS", /* 4 */ "NX_CUT_BUFFER_SERVER", /* 5 */ + /* Unfortunately we cannot rename this to NX_SELTRANS_TO_AGENT + because nomachine's nxclient is depending on this + selection */ "TARGETS", /* 6 */ "TEXT", /* 7 */ "NX_AGENT_SIGNATURE", /* 8 */ @@ -90,7 +93,8 @@ static char *nxagentAtomNames[NXAGENT_NUMBER_OF_ATOMS + 1] = "UTF8_STRING", /* 12 */ "_NET_WM_STATE", /* 13 */ "_NET_WM_STATE_FULLSCREEN", /* 14 */ - "NX_CUT_BUFFER_CLIENT", /* 15 */ + "NX_SELTRANS_FROM_AGENT", /* 15 */ + "COMPOUND_TEXT", /* 16 */ NULL, NULL }; |