diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-14 16:23:43 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-14 16:23:43 +0100 |
commit | 09d2732b4e299eaa06c64b7a683529e337691c59 (patch) | |
tree | 3a07c4a95980c0f34b1d3ce2f55388dd7677c685 /debian/patches/0206_nxagent_clipboard-as-nxoption.full.patch | |
parent | 8c98a401b49506f969dc9263d9bd566e5b31a572 (diff) | |
download | nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.gz nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.bz2 nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.zip |
Patch system: Prepend a "0" to every patch file name in debian/patches/. Adapt only this changelog stanza to this modification.
Diffstat (limited to 'debian/patches/0206_nxagent_clipboard-as-nxoption.full.patch')
-rw-r--r-- | debian/patches/0206_nxagent_clipboard-as-nxoption.full.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/debian/patches/0206_nxagent_clipboard-as-nxoption.full.patch b/debian/patches/0206_nxagent_clipboard-as-nxoption.full.patch new file mode 100644 index 000000000..12b51dc0e --- /dev/null +++ b/debian/patches/0206_nxagent_clipboard-as-nxoption.full.patch @@ -0,0 +1,53 @@ +Descripion: Add -clipboard cmdline option to nxagent +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +--- 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 |