Fix declarations in xlib-2.0.gir

FIx declarations of the subset of XLib types in xlib-2.0.gir so that
they match reality from X11 headers.

https://bugzilla.gnome.org/show_bug.cgi?id=655486

diff --git a/gir/xlib-2.0.gir b/gir/xlib-2.0.gir
index 2428f74..eaaba02 100644 (file)
--- a/gir/xlib-2.0.gir
+++ b/gir/xlib-2.0.gir
@@ -5,24 +5,50 @@
   <namespace name="xlib" version="2.0"
             c:identifier-prefixes=""
             c:symbol-prefixes="X">
-    <record name="Atom" c:type="Atom"/>
-    <record name="Colormap" c:type="Colormap"/>
-    <record name="Cursor" c:type="Cursor"/>
+    <alias name="Atom" c:type="Atom">
+      <type name="gulong" c:type="gulong"/>
+    </alias>
+    <alias name="Colormap" c:type="Colormap">
+      <type name="gulong" c:type="gulong"/>
+    </alias>
+    <alias name="Cursor" c:type="Cursor">
+      <type name="gulong" c:type="gulong"/>
+    </alias>
     <record name="Display" c:type="Display"/>
-    <record name="Drawable" c:type="Drawable"/>
-    <record name="GC" c:type="GC"/>
-    <record name="KeyCode" c:type="KeyCode"/>
-    <record name="KeySym" c:type="KeySym"/>
-    <record name="Picture" c:type="Picture"/>
+    <alias name="Drawable" c:type="Drawable">
+      <type name="gulong" c:type="gulong"/>
+    </alias>
+    <alias name="GC" c:type="GC">
+      <type name="gpointer" c:type="gpointer"/>
+    </alias>
+    <alias name="KeyCode" c:type="KeyCode">
+      <type name="guint8" c:type="guint8"/>
+    </alias>
+    <alias name="KeySym" c:type="KeySym">
+      <type name="gulong" c:type="gulong"/>
+    </alias>
+    <alias name="Picture" c:type="Picture">
+      <type name="gulong" c:type="gulong"/>
+    </alias>
     <record name="Screen" c:type="Screen"/>
-    <record name="Time" c:type="Time"/>
+    <alias name="Time" c:type="Time">
+      <type name="gulong" c:type="gulong"/>
+    </alias>
     <record name="Visual" c:type="Visual"/>
-    <record name="VisualID" c:type="VisualID"/>
-    <record name="Window" c:type="Window"/>
-    <record name="XEvent" c:type="XEvent"/>
+    <alias name="VisualID" c:type="VisualID">
+      <type name="gulong" c:type="gulong"/>
+    </alias>
+    <alias name="Window" c:type="Window">
+      <type name="gulong" c:type="gulong"/>
+    </alias>
+    <union name="XEvent" c:type="XEvent"/>
     <record name="XConfigureEvent" c:type="XConfigureEvent"/>
-    <record name="XID" c:type="XID"/>
-    <record name="Pixmap" c:type="Pixmap"/>
+    <alias name="XID" c:type="XID">
+      <type name="gulong" c:type="gulong"/>
+    </alias>
+    <alias name="Pixmap" c:type="Pixmap">
+      <type name="gulong" c:type="gulong"/>
+    </alias>
     <record name="XImage" c:type="XImage"/>
     <record name="XFontStruct" c:type="XFontStruct"/>
     <record name="XTrapezoid" c:type="XTrapezoid"/>