From c6de8d335b9ce0d0e3be4d0acb760d71007abb62 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Fri, 26 Aug 2011 16:47:02 +0200
Subject: Revert "xlib: fix the type of XID"

This reverts commit 3553cd0a4631f1b57fb608e3f3f78a1a0cfd602a.

Turns out it was wrong, XID is 64 bit on a 64 bit system. Plus
the scanner doesn't like multiple level typedefs.
---
 gir/xlib-2.0.gir | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/gir/xlib-2.0.gir b/gir/xlib-2.0.gir
index b4c8b47b..eaaba022 100644
--- a/gir/xlib-2.0.gir
+++ b/gir/xlib-2.0.gir
@@ -6,44 +6,48 @@
 	     c:identifier-prefixes=""
 	     c:symbol-prefixes="X">
     <alias name="Atom" c:type="Atom">
-      <type name="ID" c:type="XID"/>
+      <type name="gulong" c:type="gulong"/>
     </alias>
     <alias name="Colormap" c:type="Colormap">
-      <type name="ID" c:type="XID"/>
+      <type name="gulong" c:type="gulong"/>
     </alias>
     <alias name="Cursor" c:type="Cursor">
-      <type name="ID" c:type="XID"/>
+      <type name="gulong" c:type="gulong"/>
     </alias>
     <record name="Display" c:type="Display"/>
     <alias name="Drawable" c:type="Drawable">
-      <type name="ID" c:type="XID"/>
+      <type name="gulong" c:type="gulong"/>
+    </alias>
+    <alias name="GC" c:type="GC">
+      <type name="gpointer" c:type="gpointer"/>
     </alias>
-    <record name="GC" c:type="GC"/>
     <alias name="KeyCode" c:type="KeyCode">
-      <type name="guchar" c:type="unsigned char"/>
+      <type name="guint8" c:type="guint8"/>
     </alias>
     <alias name="KeySym" c:type="KeySym">
-      <type name="ID" c:type="XID"/>
+      <type name="gulong" c:type="gulong"/>
+    </alias>
+    <alias name="Picture" c:type="Picture">
+      <type name="gulong" c:type="gulong"/>
     </alias>
-    <record name="Picture" c:type="Picture"/>
     <record name="Screen" c:type="Screen"/>
     <alias name="Time" c:type="Time">
-      <type name="guint32" c:type="CARD32"/>
+      <type name="gulong" c:type="gulong"/>
     </alias>
     <record name="Visual" c:type="Visual"/>
     <alias name="VisualID" c:type="VisualID">
-      <type name="ID" c:type="XID"/>
+      <type name="gulong" c:type="gulong"/>
     </alias>
     <alias name="Window" c:type="Window">
-      <type name="ID" c:type="XID"/>
+      <type name="gulong" c:type="gulong"/>
     </alias>
     <union name="XEvent" c:type="XEvent"/>
     <record name="XConfigureEvent" c:type="XConfigureEvent"/>
-    <alias name="ID" c:type="XID">
-      <type name="guint32" c:type="CARD32"/>
+    <alias name="XID" c:type="XID">
+      <type name="gulong" c:type="gulong"/>
     </alias>
     <alias name="Pixmap" c:type="Pixmap">
-      <type name="ID" c:type="XID"/>
+      <type name="gulong" c:type="gulong"/>
     </alias>
     <record name="XImage" c:type="XImage"/>
     <record name="XFontStruct" c:type="XFontStruct"/>
-- 
cgit v1.2.1