diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-06-27 02:01:15 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-06-27 02:01:41 +0200 |
| commit | 0cf283dca109ff29e18cd36fdbd2e51dadd52772 (patch) | |
| tree | 94b8092ecfafea0044f2402971aa71514f6c20f8 /debian/patches | |
| parent | c62b81304ca9906fe608f7387025162107d8d8ab (diff) | |
| download | nx-libs-0cf283dca109ff29e18cd36fdbd2e51dadd52772.tar.gz nx-libs-0cf283dca109ff29e18cd36fdbd2e51dadd52772.tar.bz2 nx-libs-0cf283dca109ff29e18cd36fdbd2e51dadd52772.zip | |
Add 206_nxagent_clipboard-as-nxoption.full.patch. Make the clipboard option configurable in nxagent via NX options as addition to the command line parameter -clipboard. Note that the command line parameter overrides the clipboard NX option. Possible values are both or 1, client, server, none or 0.
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/206_nxagent_clipboard-as-nxoption.full.patch | 50 | ||||
| -rw-r--r-- | debian/patches/210_nxagent_nxcomp_save_session_state.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 52 insertions, 1 deletions
diff --git a/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch b/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch new file mode 100644 index 000000000..f173b25ca --- /dev/null +++ b/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch @@ -0,0 +1,50 @@ +--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c +@@ -984,7 +984,7 @@ + + if (!strcmp(argv[i], "-clipboard")) + { +- if (!strcmp(argv[i+1], "both")) ++ if ((!strcmp(argv[i+1], "both")) || (!strcmp(argv[i+1], "1"))) + { + nxagentChangeOption(Clipboard, ClipboardBoth); + } +@@ -996,7 +996,7 @@ + { + nxagentChangeOption(Clipboard, ClipboardServer); + } +- else if (!strcmp(argv[i+1], "none")) ++ else if ((!strcmp(argv[i+1], "none")) || (!strcmp(argv[i+1], "1"))) + { + nxagentChangeOption(Clipboard, ClipboardNone); + } +@@ -1255,6 +1255,29 @@ + + return; + } ++ else if (strcmp(name, "clipboard") == 0) ++ { ++ if ((strcmp(value, "both") == 0) || (strcmp(value, "1") == 0)) ++ { ++ nxagentChangeOption(Clipboard, ClipboardBoth); ++ } ++ else if (strcmp(value, "client") == 0) ++ { ++ nxagentChangeOption(Clipboard, ClipboardClient); ++ } ++ else if (strcmp(value, "server") == 0) ++ { ++ nxagentChangeOption(Clipboard, ClipboardServer); ++ } ++ else if ((strcmp(value, "none") == 0) || (strcmp(value, "0") == 0)) ++ { ++ nxagentChangeOption(Clipboard, ClipboardNone); ++ } ++ else ++ { ++ nxagentChangeOption(Clipboard, ClipboardBoth); ++ } ++ } + else + { + #ifdef DEBUG diff --git a/debian/patches/210_nxagent_nxcomp_save_session_state.patch b/debian/patches/210_nxagent_nxcomp_save_session_state.patch index 53cfb859e..fa0284894 100644 --- a/debian/patches/210_nxagent_nxcomp_save_session_state.patch +++ b/debian/patches/210_nxagent_nxcomp_save_session_state.patch @@ -23,7 +23,7 @@ Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> else if (!strcmp(name, "fullscreen")) { if (nxagentReconnectTrap == True) -@@ -1362,6 +1368,11 @@ +@@ -1385,6 +1391,11 @@ validateString(nxagentOptionFile)); #endif diff --git a/debian/patches/series b/debian/patches/series index 0689392cd..733f49ce7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -48,6 +48,7 @@ 203_nxagent_disable-rootless-exit.full.patch 204_nxagent_repaint-solidpict.full.patch 205_nxagent_refresh-adsl.full.patch +206_nxagent_clipboard-as-nxoption.full.patch 209_x2goagent_add-man-page.full.patch 220_nxproxy_bind-loopback-only.full+lite.patch 300_nxagent_set-wm-class.full.patch |