aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Args.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-03-28 08:58:35 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-03-28 08:58:35 +0100
commitdb7feaf9883bb0dc419593588036405ef12ebca1 (patch)
tree1a911fe1a08aed78845e17b5350c9238452a12dd /nx-X11/programs/Xserver/hw/nxagent/Args.c
parente77bf36d9afbc7e56522574b06217d57c11dd095 (diff)
downloadnx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.tar.gz
nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.tar.bz2
nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.zip
Revert "release 3.5.0.19"
This reverts commit e77bf36d9afbc7e56522574b06217d57c11dd095.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Args.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index fad0b62d8..ecf04e226 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -148,8 +148,6 @@ static int nxagentGetDialogName(void);
char nxagentVerbose = 0;
-char *nxagentKeystrokeFile = NULL;
-
int ddxProcessArgument(int argc, char *argv[], int i)
{
/*
@@ -674,12 +672,6 @@ int ddxProcessArgument(int argc, char *argv[], int i)
return 1;
}
- if (!strcmp(argv[i], "-norootlessexit")) {
- nxagentChangeOption(NoRootlessExit, True);
- return 1;
- }
-
-
if (!strcmp(argv[i], "-noonce"))
{
nxagentOnce = False;
@@ -1023,20 +1015,6 @@ int ddxProcessArgument(int argc, char *argv[], int i)
return 1;
}
- if (!strcmp(argv[i], "-keystrokefile"))
- {
- if (i + 1 < argc)
- {
- if (NULL != (nxagentKeystrokeFile = strdup(argv[i + 1])))
- {
- return 2;
- } else {
- FatalError("malloc failed");
- }
- }
- return 0;
- }
-
return 0;
}
@@ -1877,7 +1855,6 @@ void ddxUseMsg()
ErrorF("The NX system adds the following arguments:\n");
ErrorF("-forcenx force use of NX protocol messages assuming communication through nxproxy\n");
ErrorF("-timeout int auto-disconnect timeout in seconds (minimum allowed: 60)\n");
- ErrorF("-norootlessexit don't exit if there are no clients in rootless mode\n");
#ifdef RENDER
ErrorF("-norender disable the use of the render extension\n");
ErrorF("-nocomposite disable the use of the composite extension\n");