[xorg-commit-diffs] xc/lib/Xst Xst_conv.c, 1.1.4.2, 1.1.4.3 Xst_util.c, 1.1.4.2, 1.1.4.3 Xst_util.h, 1.1.4.2, 1.1.4.3

[Jay Hobson]

Committed by: jhobson

Update of /cvs/xorg/xc/lib/Xst
In directory pdx:/tmp/cvs-serv12233

Modified Files:
      Tag: XORG-RELEASE-1-STSF
	Xst_conv.c Xst_util.c Xst_util.h 
Log Message:
Fixed problem where Xorg version does not display text for xstls
Make XSTClientErrorHandler available for external use



Index: Xst_conv.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xst/Attic/Xst_conv.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Xst_conv.c	8 Apr 2004 19:50:58 -0000	1.1.4.2
+++ b/Xst_conv.c	14 Apr 2004 20:56:29 -0000	1.1.4.3
@@ -370,6 +370,7 @@
     utf16le = tutf16;
     iString = tchar;
 #endif
+#if 0
 #ifdef i386
     /*
      * For x86, Convert to UTF16LE 
@@ -383,7 +384,7 @@
         iString[i * 2 + 1] = (char) temp;
     }
 #endif
-
+#endif
     /*
      * Create space for the destination code
      */

Index: Xst_util.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xst/Attic/Xst_util.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Xst_util.c	13 Apr 2004 21:30:59 -0000	1.1.4.2
+++ b/Xst_util.c	14 Apr 2004 20:56:29 -0000	1.1.4.3
@@ -239,7 +239,7 @@
         {
 	    fprintf ( stderr, "X Error of failed request: %s\n", 
                       ErrorCodeName ( rep->error_code - XSTClientErrorBase ));
-            fprintf ( stderr, "  Major opcode of failed request:  182 (ST)\n" );
+            fprintf ( stderr, "  Major opcode of failed request:  (ST Client Mode)\n" );
             fprintf ( stderr, "  Minor opcode of failed request:  %d (%s)\n", rep->minor_code, XSTErrors[rep->minor_code] );
             fprintf ( stderr, "  Serial number of failed request:  0\n" );
             fprintf ( stderr, "  Current serial number in output stream:  0\n" );

Index: Xst_util.h
===================================================================
RCS file: /cvs/xorg/xc/lib/Xst/Attic/Xst_util.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Xst_util.h	13 Apr 2004 21:30:59 -0000	1.1.4.2
+++ b/Xst_util.h	14 Apr 2004 20:56:29 -0000	1.1.4.3
@@ -73,6 +73,8 @@
 
 void XST_Error ( Display *dpy, int iFunc, STStatus iError );
 
+int XSTClientErrorHandler ( Display *dpy, XErrorEvent *rep );
+
 /**
  *
  * @param dpy			Display