aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-10 19:33:51 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-10 19:40:56 +0100
commit4ef611eea9b10ed5851abb990835ce73bbac6a9f (patch)
tree907b48a2a9fd804deda2903e157a7dd6913bc005
parent35aab85c79200d861c906b691bf8b6be99d58590 (diff)
downloadnx-libs-4ef611eea9b10ed5851abb990835ce73bbac6a9f.tar.gz
nx-libs-4ef611eea9b10ed5851abb990835ce73bbac6a9f.tar.bz2
nx-libs-4ef611eea9b10ed5851abb990835ce73bbac6a9f.zip
Add -clipboard cmdline option to nxagent (206_nxagent_clipboard-as-nxoption.full.patch).
-rw-r--r--debian/patches/206_nxagent_clipboard-as-nxoption.full.patch53
-rw-r--r--debian/patches/series1
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c27
3 files changed, 25 insertions, 56 deletions
diff --git a/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch b/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch
deleted file mode 100644
index 12b51dc0e..000000000
--- a/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
diff --git a/debian/patches/series b/debian/patches/series
index 4bbe897df..dbc6d9ce6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-206_nxagent_clipboard-as-nxoption.full.patch
207_nxagent_fix-xfixes-selection.full.patch
209_x2goagent_add-man-page.full.patch
210_nxagent_save_session_state.full.patch
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 6666393e4..c72b9c4e8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -984,7 +984,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
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 @@ int ddxProcessArgument(int argc, char *argv[], int i)
{
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 @@ static void nxagentParseOptions(char *name, char *value)
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