[PATCH] Do not set the SendEvent (0x80) bit in the event_to_wire vectors as the server will do this for us.

[Sam Spilsbury]

---
 src/XSecurity.c |    2 +-
 src/XShape.c    |    3 ++-
 src/XShm.c      |    2 +-
 src/XSync.c     |    4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/XSecurity.c b/src/XSecurity.c
index b2aa98c..03be54f 100644
--- a/src/XSecurity.c
+++ b/src/XSecurity.c
@@ -135,7 +135,7 @@ event_to_wire(Display *dpy, XEvent *event, xEvent *wire)
 		(xSecurityAuthorizationRevokedEvent *)wire;
 	    XSecurityAuthorizationRevokedEvent *revent =
 		(XSecurityAuthorizationRevokedEvent *)event;
-	    rwire->type = revent->type | (revent->send_event ? 0x80 : 0);
+	    rwire->type = revent->type;
 	    rwire->sequenceNumber = revent->serial & 0xFFFF;
 	    return True;
 	}
diff --git a/src/XShape.c b/src/XShape.c
index 708c20f..1a606cc 100644
--- a/src/XShape.c
+++ b/src/XShape.c
@@ -122,7 +122,7 @@ event_to_wire (Display *dpy, XEvent *re, xEvent *event)
     case ShapeNotify:
     	se = (XShapeEvent *) re;
 	sevent = (xShapeNotifyEvent *) event;
-    	sevent->type = se->type | (se->send_event ? 0x80 : 0);
+    	sevent->type = se->type;
     	sevent->sequenceNumber = se->serial & 0xffff;
     	sevent->window = se->window;
     	sevent->kind = se->kind;
@@ -133,6 +133,7 @@ event_to_wire (Display *dpy, XEvent *re, xEvent *event)
 	sevent->time = se->time;
     	return 1;
     }
+
     return 0;
 }
 
diff --git a/src/XShm.c b/src/XShm.c
index d1f1a4d..d5f3c5e 100644
--- a/src/XShm.c
+++ b/src/XShm.c
@@ -123,7 +123,7 @@ event_to_wire (Display *dpy, XEvent *re, xEvent *event)
     case ShmCompletion:
     	se = (XShmCompletionEvent *) re;
 	sevent = (xShmCompletionEvent *) event;
-    	sevent->type = se->type | (se->send_event ? 0x80 : 0);
+    	sevent->type = se->type;
     	sevent->sequenceNumber = se->serial & 0xffff;
     	sevent->drawable = se->drawable;
     	sevent->majorEvent = se->major_code;
diff --git a/src/XSync.c b/src/XSync.c
index 2bdecfc..f102aee 100644
--- a/src/XSync.c
+++ b/src/XSync.c
@@ -265,7 +265,7 @@ event_to_wire(Display *dpy, XEvent *event, xEvent *wire)
       case XSyncCounterNotify:
 	awire = (xSyncCounterNotifyEvent *) wire;
 	aevent = (XSyncCounterNotifyEvent *) event;
-	awire->type = aevent->type | (aevent->send_event ? 0x80 : 0);
+	awire->type = aevent->type;
 	awire->sequenceNumber = aevent->serial & 0xFFFF;
 	awire->counter = aevent->counter;
 	awire->wait_value_lo = XSyncValueLow32(aevent->wait_value);
@@ -280,7 +280,7 @@ event_to_wire(Display *dpy, XEvent *event, xEvent *wire)
       case XSyncAlarmNotify:
 	ane = (xSyncAlarmNotifyEvent *) wire;	/* ENCODING EVENT PTR */
 	anl = (XSyncAlarmNotifyEvent *) event;	/* LIBRARY EVENT PTR */
-	ane->type = anl->type | (anl->send_event ? 0x80 : 0);
+	ane->type = anl->type;
 	ane->sequenceNumber = anl->serial & 0xFFFF;
 	ane->alarm = anl->alarm;
 	ane->counter_value_lo = XSyncValueLow32(anl->counter_value);
-- 
1.7.5.4


--=-jITLpz3KjosSMsRA6f0b--