diff options
| author | Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de> | 2012-02-28 13:44:25 +0100 |
|---|---|---|
| committer | Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de> | 2012-02-28 13:44:33 +0100 |
| commit | be86627adf0392f94d70ad28cb9c6867b3bef0f5 (patch) | |
| tree | 2e7bb9243829adc06b49e6516e018e86cfeca6f9 /debian/patches | |
| parent | 0586f0d6e83cfa9ea12a3bf6a0015a4e84d09ae2 (diff) | |
| download | nx-libs-be86627adf0392f94d70ad28cb9c6867b3bef0f5.tar.gz nx-libs-be86627adf0392f94d70ad28cb9c6867b3bef0f5.tar.bz2 nx-libs-be86627adf0392f94d70ad28cb9c6867b3bef0f5.zip | |
Create patch: 203_nxagent_disable-rootless-exit.full.patch
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/203_nxagent_disable-rootless-exit.full.patch | 60 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 61 insertions, 0 deletions
diff --git a/debian/patches/203_nxagent_disable-rootless-exit.full.patch b/debian/patches/203_nxagent_disable-rootless-exit.full.patch new file mode 100644 index 000000000..03154bb07 --- /dev/null +++ b/debian/patches/203_nxagent_disable-rootless-exit.full.patch @@ -0,0 +1,60 @@ +--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c +@@ -656,6 +656,12 @@ + return 1; + } + ++ if (!strcmp(argv[i], "-norootlessexit")) { ++ nxagentChangeOption(NoRootlessExit, True); ++ return 1; ++ } ++ ++ + if (!strcmp(argv[i], "-noonce")) + { + nxagentOnce = False; +@@ -1837,6 +1843,7 @@ + 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"); +--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +@@ -217,7 +217,7 @@ + + if (nxagentOption(Rootless) && + nxagentLastWindowDestroyed && nxagentRootlessDialogPid == 0 && +- now > nxagentLastWindowDestroyedTime + 30 * 1000) ++ now > nxagentLastWindowDestroyedTime + 30 * 1000 && !nxagentOption(NoRootlessExit)) + { + #ifdef WARNING + fprintf(stderr, "nxagentBlockHandler: No application running. Closing the session.\n"); +--- a/nx-X11/programs/Xserver/hw/nxagent/Options.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c +@@ -56,6 +56,7 @@ + nxagentOptions.Persistent = 1; + nxagentOptions.Rootless = UNDEFINED; + nxagentOptions.Fullscreen = UNDEFINED; ++ nxagentOptions.NoRootlessExit = False; + + nxagentOptions.X = 0; + nxagentOptions.Y = 0; +--- a/nx-X11/programs/Xserver/hw/nxagent/Options.h ++++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h +@@ -369,6 +369,13 @@ + + int CopyBufferSize; + ++ /* ++ * True if agent should not exit if there are no ++ * clients in rootless mode ++ */ ++ ++ int NoRootlessExit; ++ + } AgentOptionsRec; + + typedef AgentOptionsRec *AgentOptionsPtr; diff --git a/debian/patches/series b/debian/patches/series index cf194f147..654f25c9e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -37,6 +37,7 @@ 200_nxagent_check-binary-x2go-flavour.full.patch 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch 202_nx-x11_enable-xinerama.full.patch +203_nxagent_disable-rootless-exit.full.patch 209_x2goagent-add-man-page.full.patch 300_nxagent_set-wm-class.full.patch 301_nx-X11_use-shared-libs.full.patch |