[X2Go-Commits] nx-libs.git - build-main (branch) updated: nx-X11/3.3.0-3

[X2Go dev team]

The branch, build-main has been updated
       via  01ed75712979168d0355bd594a741c02a088685c (commit)
      from  30463b084b2833193aa6fdc2ceafefc8a1c06fee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 nx-X11/CHANGELOG                                  |   14 ++++++++++++++
 nx-X11/CHANGELOG.NX.original                      |   14 ++++++++++++++
 nx-X11/{CHANGELOG => CHANGELOG~}                  |   10 ++++++++++
 nx-X11/lib/X11/XlibInt.c                          |   13 +++++++++++++
 nx-X11/lib/X11/XlibInt.c.NX.original              |   13 +++++++++++++
 nx-X11/programs/Xserver/xkb/ddxLoad.c             |    8 ++++----
 nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original |    8 ++++----
 7 files changed, 72 insertions(+), 8 deletions(-)
 copy nx-X11/{CHANGELOG => CHANGELOG~} (99%)

The diff of changes is:
diff --git a/nx-X11/CHANGELOG b/nx-X11/CHANGELOG
index 60104c6..f576284 100644
--- a/nx-X11/CHANGELOG
+++ b/nx-X11/CHANGELOG
@@ -1,5 +1,19 @@
 ChangeLog:
 
+nx-X11-3.3.0-3
+
+- Fixed the search path for the XKB base directory.
+
+nx-X11-3.3.0-2
+
+- Fixed TR10F02116. The X11 agent could enter an indefinite wait state
+  if connection to X display is broken and libX11 output buffer is not
+  empty.
+
+nx-X11-3.3.0-1
+
+- Opened the 3.3.0 branch based on nx-X11-3.2.0-2.
+
 nx-X11-3.2.0-2
 
 - Imported patch fixing issues from  X.Org security advisory, June
diff --git a/nx-X11/CHANGELOG.NX.original b/nx-X11/CHANGELOG.NX.original
index 60104c6..f576284 100644
--- a/nx-X11/CHANGELOG.NX.original
+++ b/nx-X11/CHANGELOG.NX.original
@@ -1,5 +1,19 @@
 ChangeLog:
 
+nx-X11-3.3.0-3
+
+- Fixed the search path for the XKB base directory.
+
+nx-X11-3.3.0-2
+
+- Fixed TR10F02116. The X11 agent could enter an indefinite wait state
+  if connection to X display is broken and libX11 output buffer is not
+  empty.
+
+nx-X11-3.3.0-1
+
+- Opened the 3.3.0 branch based on nx-X11-3.2.0-2.
+
 nx-X11-3.2.0-2
 
 - Imported patch fixing issues from  X.Org security advisory, June
diff --git a/nx-X11/CHANGELOG b/nx-X11/CHANGELOG~
similarity index 99%
copy from nx-X11/CHANGELOG
copy to nx-X11/CHANGELOG~
index 60104c6..754ee07 100644
--- a/nx-X11/CHANGELOG
+++ b/nx-X11/CHANGELOG~
@@ -1,5 +1,15 @@
 ChangeLog:
 
+nx-X11-3.3.0-2
+
+- Fixed TR10F02116. The X11 agent could enter an indefinite wait state
+  if connection to X display is broken and libX11 output buffer is not
+  empty.
+
+nx-X11-3.3.0-1
+
+- Opened the 3.3.0 branch based on nx-X11-3.2.0-2.
+
 nx-X11-3.2.0-2
 
 - Imported patch fixing issues from  X.Org security advisory, June
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c
index d440d66..9a8ac4b 100644
--- a/nx-X11/lib/X11/XlibInt.c
+++ b/nx-X11/lib/X11/XlibInt.c
@@ -1840,7 +1840,20 @@ _XSend (
         int congestion;
 #endif
 
+#ifdef AGENT_SERVER
+        if (!size || (dpy->flags & XlibDisplayIOError))
+        {
+            if (dpy->flags & XlibDisplayIOError)
+            {
+	        dpy->bufptr = dpy->buffer;
+	        dpy->last_req = (char *)&_dummy_request;
+            }
+
+	    return;
+	}
+#else
 	if (!size || (dpy->flags & XlibDisplayIOError)) return;
+#endif
 	dbufsize = dpy->bufptr - dpy->buffer;
 #ifdef XTHREADS
 	dpy->flags |= XlibDisplayWriting;
diff --git a/nx-X11/lib/X11/XlibInt.c.NX.original b/nx-X11/lib/X11/XlibInt.c.NX.original
index d440d66..9a8ac4b 100644
--- a/nx-X11/lib/X11/XlibInt.c.NX.original
+++ b/nx-X11/lib/X11/XlibInt.c.NX.original
@@ -1840,7 +1840,20 @@ _XSend (
         int congestion;
 #endif
 
+#ifdef AGENT_SERVER
+        if (!size || (dpy->flags & XlibDisplayIOError))
+        {
+            if (dpy->flags & XlibDisplayIOError)
+            {
+	        dpy->bufptr = dpy->buffer;
+	        dpy->last_req = (char *)&_dummy_request;
+            }
+
+	    return;
+	}
+#else
 	if (!size || (dpy->flags & XlibDisplayIOError)) return;
+#endif
 	dbufsize = dpy->bufptr - dpy->buffer;
 #ifdef XTHREADS
 	dpy->flags |= XlibDisplayWriting;
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c
index 8def401..8e35ab8 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c
+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c
@@ -559,7 +559,7 @@ char 	*cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
 #ifndef __UNIXOS2__
 
 #ifdef NXAGENT_SERVER
-        char *xkbbasedir = _NXGetXkbCompPath(XkbBaseDirectory);
+        char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory);
         char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory);
 #else
         char *xkbbasedir = XkbBaseDirectory;
@@ -569,7 +569,7 @@ char 	*cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
 #else
         /* relocate the basedir and replace the slashes with backslashes */
 #ifdef NXAGENT_SERVER
-        char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBaseDirectory));
+        char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory));
         char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory));
 #else
         char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory);
@@ -675,7 +675,7 @@ char tmpname[PATH_MAX];
 #endif
 #ifndef __UNIXOS2__
 #ifdef NXAGENT_SERVER
-        char *xkbbasedir = _NXGetXkbCompPath(XkbBaseDirectory);
+        char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory);
         char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory);
 #else
         char *xkbbasedir = XkbBaseDirectory;
@@ -684,7 +684,7 @@ char tmpname[PATH_MAX];
 #else
         int i;
 #ifdef NXAGENT_SERVER
-        char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBaseDirectory));
+        char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory));
         char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory));
 #else
         char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory);
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original b/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original
index 8def401..8e35ab8 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original
+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original
@@ -559,7 +559,7 @@ char 	*cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
 #ifndef __UNIXOS2__
 
 #ifdef NXAGENT_SERVER
-        char *xkbbasedir = _NXGetXkbCompPath(XkbBaseDirectory);
+        char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory);
         char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory);
 #else
         char *xkbbasedir = XkbBaseDirectory;
@@ -569,7 +569,7 @@ char 	*cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
 #else
         /* relocate the basedir and replace the slashes with backslashes */
 #ifdef NXAGENT_SERVER
-        char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBaseDirectory));
+        char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory));
         char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory));
 #else
         char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory);
@@ -675,7 +675,7 @@ char tmpname[PATH_MAX];
 #endif
 #ifndef __UNIXOS2__
 #ifdef NXAGENT_SERVER
-        char *xkbbasedir = _NXGetXkbCompPath(XkbBaseDirectory);
+        char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory);
         char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory);
 #else
         char *xkbbasedir = XkbBaseDirectory;
@@ -684,7 +684,7 @@ char tmpname[PATH_MAX];
 #else
         int i;
 #ifdef NXAGENT_SERVER
-        char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBaseDirectory));
+        char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory));
         char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory));
 #else
         char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory);


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).