more clean up. use log instead of fmt.Print to stderr. bug fix for event blocking (a hack fix for now).

1 files changed, 8 insertions, 4 deletions

diff --git a/nexgb/auto_composite.go b/nexgb/auto_composite.go
index aec15c9..4262468 100644
--- a/nexgb/auto_composite.go
+++ b/nexgb/auto_composite.go
@@ -1,7 +1,7 @@
 package xgb
 
 /*
-	This file was generated by composite.xml on May 6 2012 5:48:46pm EDT.
+	This file was generated by composite.xml on May 7 2012 9:17:56pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -17,7 +17,7 @@ func (c *Conn) CompositeInit() error {
 	case err != nil:
 		return err
 	case !reply.Present:
-		return newError("No extension named Composite could be found on on the server.")
+		return errorf("No extension named Composite could be found on on the server.")
 	}
 
 	c.extLock.Lock()
@@ -25,6 +25,9 @@ func (c *Conn) CompositeInit() error {
 	for evNum, fun := range newExtEventFuncs["Composite"] {
 		newEventFuncs[int(reply.FirstEvent)+evNum] = fun
 	}
+	for errNum, fun := range newExtErrorFuncs["Composite"] {
+		newErrorFuncs[int(reply.FirstError)+errNum] = fun
+	}
 	c.extLock.Unlock()
 
 	return nil
@@ -32,8 +35,11 @@ func (c *Conn) CompositeInit() error {
 
 func init() {
 	newExtEventFuncs["Composite"] = make(map[int]newEventFun)
+	newExtErrorFuncs["Composite"] = make(map[int]newErrorFun)
 }
 
+// Skipping definition for base type 'Int32'
+
 // Skipping definition for base type 'Void'
 
 // Skipping definition for base type 'Byte'
@@ -58,8 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Int16'
 
-// Skipping definition for base type 'Int32'
-
 const (
 	CompositeRedirectAutomatic = 0
 	CompositeRedirectManual    = 1