aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/200_nxagent_check-binary-x2go-flavour.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-01-11 16:17:51 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-01-11 16:17:51 +0100
commit405bc8f259f230947e5fe8341f0bab8f0f88c678 (patch)
tree2ffd91369f734eb7ef9e7dede9df7b08b5f82b91 /debian/patches/200_nxagent_check-binary-x2go-flavour.patch
parent19f24873388ce9a2136f8d3fe8145d6ce4576730 (diff)
downloadnx-libs-405bc8f259f230947e5fe8341f0bab8f0f88c678.tar.gz
nx-libs-405bc8f259f230947e5fe8341f0bab8f0f88c678.tar.bz2
nx-libs-405bc8f259f230947e5fe8341f0bab8f0f88c678.zip
Add X2Go agent / NX agent flavouring via patch system:
- 200_nxagent_check-binary-x2go-flavour.patch - 201_nxagent_set-x2go-icon-if-x2goagent-flavour.patch - 300_nxagent_set-wm-class.patch - 999_nxagent_unbrand-nxagent-brand-x2goagent.patch
Diffstat (limited to 'debian/patches/200_nxagent_check-binary-x2go-flavour.patch')
-rw-r--r--debian/patches/200_nxagent_check-binary-x2go-flavour.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/debian/patches/200_nxagent_check-binary-x2go-flavour.patch b/debian/patches/200_nxagent_check-binary-x2go-flavour.patch
new file mode 100644
index 000000000..089b57022
--- /dev/null
+++ b/debian/patches/200_nxagent_check-binary-x2go-flavour.patch
@@ -0,0 +1,64 @@
+Description: Detect nxagent/x2goagent flavour
+ Whether the agent runs in X2Go or NX mode is decide by the
+ name of the binary that executes the code.
+ .
+ Binary name equal to nxagent -> (Free)NX flavour
+ Binary name equal to x2goagent -> X2Go flavour
+Forwarded: not-needed
+Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
+Last-Update: 2012-01-11
+--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
+@@ -178,6 +178,29 @@
+
+ int nxagentDoFullGeneration = 1;
+
++ /*
++ * 1 if agent running as X2goAgent
++ * 0 if NX Agent
++ */
++int nxagentX2go;
++
++/*
++ * Checking if agent is x2go agent
++ */
++
++void checkX2goAgent()
++{
++ extern const char *__progname;
++ if( strcasecmp(__progname,"x2goagent") == 0)
++ {
++ fprintf(stderr, "\nrunning as X2Go Agent\n");
++ nxagentX2go=1;
++ }
++ else
++ nxagentX2go=0;
++}
++
++
+ /*
+ * Called at X server's initialization.
+ */
+@@ -194,6 +217,11 @@
+ #endif
+
+ /*
++ * Check if we running as X2Go Agent
++ */
++ checkX2goAgent();
++
++ /*
+ * Print our pid and version information.
+ */
+
+--- a/nx-X11/programs/Xserver/hw/nxagent/Init.h
++++ b/nx-X11/programs/Xserver/hw/nxagent/Init.h
+@@ -37,6 +37,8 @@
+ extern int nxagentBackingStore;
+ extern int nxagentSaveUnder;
+
++extern int nxagentX2go;
++
+ extern ServerGrabInfoRec nxagentGrabServerInfo;
+
+ #endif /* __Init_H__ */