From db7feaf9883bb0dc419593588036405ef12ebca1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 28 Mar 2013 08:58:35 +0100 Subject: Revert "release 3.5.0.19" This reverts commit e77bf36d9afbc7e56522574b06217d57c11dd095. --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Args.c') 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"); -- cgit v1.2.3