[X2Go-Commits] [nx-libs] 10/24: Detect nxagent/x2goagent flavour (200_nxagent_check-binary-x2go-flavour.full.patch).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 1681f1110ece0e5ad0accda009f106a2081c660c
Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
Date:   Tue Feb 10 19:19:25 2015 +0100

    Detect nxagent/x2goagent flavour (200_nxagent_check-binary-x2go-flavour.full.patch).
    
      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
---
 ...00_nxagent_check-binary-x2go-flavour.full.patch |   64 --------------------
 debian/patches/series                              |    1 -
 nx-X11/programs/Xserver/hw/nxagent/Init.c          |   28 +++++++++
 nx-X11/programs/Xserver/hw/nxagent/Init.h          |    2 +
 4 files changed, 30 insertions(+), 65 deletions(-)

diff --git a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch b/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch
deleted file mode 100644
index c692020..0000000
--- a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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 at 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
-@@ -177,6 +177,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.
-  */
-@@ -193,6 +216,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__ */
diff --git a/debian/patches/series b/debian/patches/series
index 5a5a30e..f1c8a87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-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
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index acd5d41..1794f15 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -177,6 +177,29 @@ int nxagentSaveUnder;
 
 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.
  */
@@ -193,6 +216,11 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
   #endif
 
   /*
+   * Check if we running as X2Go Agent
+   */
+  checkX2goAgent();
+
+  /*
    * Print our pid and version information.
    */
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.h b/nx-X11/programs/Xserver/hw/nxagent/Init.h
index 2dc0f5c..b516c7b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.h
@@ -37,6 +37,8 @@ extern int nxagentDoFullGeneration;
 extern int nxagentBackingStore;
 extern int nxagentSaveUnder;
 
+extern int  nxagentX2go;
+
 extern ServerGrabInfoRec nxagentGrabServerInfo;
 
 #endif /* __Init_H__ */

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git