Merge branch 'master' of git://anongit.freedesktop.org/git/xcb/libxcb

diff --git a/doc/tutorial/index.html b/doc/tutorial/index.html
index 75e1f75..c540426 100644 (file)
--- a/doc/tutorial/index.html
+++ b/doc/tutorial/index.html
@@ -178,8 +178,9 @@
       level GUI toolkit like Motif,
       <a href="http://www.lesstif.org">LessTiff</a>,
       <a href="http://www.gtk.org">GTK</a>,
-      <a href="http://www.trolltech.com">QT</a> or
-      <a href="http://www.enlightenment.org">EWL</a>, or use
+      <a href="http://www.trolltech.com">QT</a>,
+      <a href="http://www.enlightenment.org">EWL</a>,
+      <a href="http://www.enlightenment.org">ETK</a>, or use
       <a href="http://cairographics.org">Cairo</a>.
       However,
       we need to start somewhere. More than this, knowing how things
@@ -2327,7 +2328,7 @@ int main ()
   while (1) {
     e = xcb_poll_for_event(c);
     if (e) {
-      switch (e->response_type) {
+      switch (e->response_type &amp; ~0x80) {
       case XCB_EXPOSE: {
         char *text;
 
@@ -3740,7 +3741,7 @@ int main ()
   while (1) {
     e = xcb_poll_for_event(c);
     if (e) {
-      switch (e->response_type) {
+      switch (e->response_type &amp; ~0x80) {
       case XCB_EXPOSE: {
         char *text;
 

diff --git a/src/c-client.xsl b/src/c-client.xsl
index be6aa30..c90e94f 100644 (file)
--- a/src/c-client.xsl
+++ b/src/c-client.xsl
@@ -449,6 +449,11 @@ authorization from the authors.
         </xsl:when>
       </xsl:choose>
     </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="self::error|self::errorcopy">
+        <constant type="number" name="{xcb:xcb-prefix(concat('Bad', @name))}" value="{@number}" />
+      </xsl:when>
+    </xsl:choose>
     <constant type="number" name="{xcb:xcb-prefix(@name)}" value="{@number}" />
     <xsl:choose>
       <xsl:when test="self::event|self::error">