[xorg-commit-diffs] xc/programs/xstls Imakefile, 1.1.4.1, 1.1.4.2 xstls.c, 1.1.4.2, 1.1.4.3

[Jay Hobson]

Committed by: jhobson

Update of /cvs/xorg/xc/programs/xstls
In directory pdx:/tmp/cvs-serv23013

Modified Files:
      Tag: XORG-RELEASE-1-STSF
	Imakefile xstls.c 
Log Message:
Changed error handling to call _ErrorHandle before going to XST error handling



Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/xstls/Attic/Imakefile,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Imakefile	6 Apr 2004 02:41:20 -0000	1.1.4.1
+++ b/Imakefile	14 Apr 2004 21:09:15 -0000	1.1.4.2
@@ -5,11 +5,11 @@
 XCOMM $XFree86: xc/programs/xstls/Imakefile,v 1.5tsi Exp $
 
         DEPLIBS = XstClientDepLibs
-LOCAL_LIBRARIES = -L../../lib/Xst -lXst -lX11 -lXt -lSM -lICE -lXext XstClientLibs
+LOCAL_LIBRARIES = -L../../lib/Xst -lXst -lX11 -lXt -lSM -lICE -lXext XstClientLibs -L../../../stsf/STClientLibrary/src -lST -L../../../stsf/stsflib -lstsf
            SRCS = xstls.c 
            OBJS = xstls.o
         HEADERS = xstls.h
-       INCLUDES = 
+       INCLUDES = -I../../../stsf/interface
         DEFINES = 
     CDEBUGFLAGS = -g
 

Index: xstls.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xstls/Attic/xstls.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/xstls.c	13 Apr 2004 22:22:28 -0000	1.1.4.2
+++ b/xstls.c	14 Apr 2004 21:09:15 -0000	1.1.4.3
@@ -78,12 +78,12 @@
     /*
      * Ignore Name not found errors since they are common
      */
-    if ( rep->error_code == 44 )
-	return;
+    if ( rep->error_code == 45 )
+	return 0;
     else if ( rep->error_code == 51 )
-	return;
+	return 0;
     else
-        _XDefaultError ( dpy, rep );
+        XSTClientErrorHandler ( dpy, rep );
 }
 
 /* ****************************************************************************
@@ -1484,7 +1484,7 @@
 
     if ( show_usage )
 	xstlsShowUsage ();
-    XSTHandleClientErrors ( dpy );
+    XSetErrorHandler ( (XErrorHandler) _ErrorHandle );
 
     /*
      * Get the XSTTypeEnv object