scanner: Better handling of empty namespace prefix for X

Add namespacing prefixes to the static .gir files.  Support the empty
prefix, as is needed for xlib.

11 files changed, 33 insertions, 11 deletions

diff --git a/gir/DBus-1.0.gir b/gir/DBus-1.0.gir
index 5eab4ce1..4ce03091 100644
--- a/gir/DBus-1.0.gir
+++ b/gir/DBus-1.0.gir
@@ -2,7 +2,9 @@
 <repository version="1.2"
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0"
-            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+            xmlns:glib="http://www.gtk.org/introspection/glib/1.0"
+	    c:identifier-prefixes="DBus"
+	    c:symbol-prefixes="DBus">
   <package name="dbus-1"/>
   <namespace name="DBus"
              version="1.0"
diff --git a/gir/DBusGLib-1.0.gir b/gir/DBusGLib-1.0.gir
index b9ba1327..ff619316 100644
--- a/gir/DBusGLib-1.0.gir
+++ b/gir/DBusGLib-1.0.gir
@@ -2,7 +2,9 @@
 <repository version="1.2"
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0"
-	    xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+	    xmlns:glib="http://www.gtk.org/introspection/glib/1.0"
+	    c:identifier-prefixes="DBus"
+	    c:symbol-prefixes="DBus">
   <include name="GObject" version="2.0"/>
   <package name="dbus-glib-1"/>
   <namespace name="DBusGLib" version="1.0" c:prefix="DBusG">
diff --git a/gir/GL-1.0.gir b/gir/GL-1.0.gir
index cf07454b..f93100ad 100644
--- a/gir/GL-1.0.gir
+++ b/gir/GL-1.0.gir
@@ -2,7 +2,9 @@
 <repository version="1.2"
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0">
-  <namespace name="GL" version="1.0">
+  <namespace name="GL" version="1.0"
+	     c:identifier-prefixes="GL"
+	     c:symbol-prefixes="gl">
     <record name="bitfield" c:type="GLbitfield"/>
     <record name="charARB" c:type="GLcharARB"/>
     <record name="clampf" c:type="GLclampf"/>
diff --git a/gir/cairo-1.0.gir b/gir/cairo-1.0.gir
index 05f1a783..dbec19de 100644
--- a/gir/cairo-1.0.gir
+++ b/gir/cairo-1.0.gir
@@ -4,7 +4,8 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0"
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
   <namespace name="cairo" version="1.0"
-	     c:prefix="cairo">
+	     c:identifier-prefixes="cairo"
+	     c:symbol-prefixes="cairo">
     <record name="Context" c:type="cairo_t" foreign="1"/>
     <record name="Surface" c:type="cairo_surface_t" foreign="1"/>
     <record name="Matrix" c:type="cairo_matrix_t" foreign="1"/>
diff --git a/gir/fontconfig-2.0.gir b/gir/fontconfig-2.0.gir
index 192d7205..e7ecd512 100644
--- a/gir/fontconfig-2.0.gir
+++ b/gir/fontconfig-2.0.gir
@@ -2,7 +2,9 @@
 <repository version="1.2"
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0">
-  <namespace name="fontconfig" version="2.0">
+  <namespace name="fontconfig" version="2.0"
+	     c:identifier-prefixes="Fc"
+	     c:symbol-prefixes="fc">
     <record name="Pattern" c:type="FcPattern"/>
     <record name="CharSet" c:type="FcCharSet"/>
     <function name="init" c:identifier="FcInit">
diff --git a/gir/freetype2-2.0.gir b/gir/freetype2-2.0.gir
index 495726a2..ac74dc8a 100644
--- a/gir/freetype2-2.0.gir
+++ b/gir/freetype2-2.0.gir
@@ -2,7 +2,9 @@
 <repository version="1.2"
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0">
-  <namespace name="freetype2" version="2.0">
+  <namespace name="freetype2" version="2.0"
+	     c:identifier-prefixes="FT"
+	     c:symbol-prefixes="FT">
     <record name="Bitmap" c:type="FT_Bitmap"/>
     <record name="Face" c:type="FT_Face"/>
     <record name="Library" c:type="FT_Library"/>
diff --git a/gir/libxml2-2.0.gir b/gir/libxml2-2.0.gir
index cd962d0e..34aeadc8 100644
--- a/gir/libxml2-2.0.gir
+++ b/gir/libxml2-2.0.gir
@@ -2,7 +2,9 @@
 <repository version="1.2"
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0">
-  <namespace name="libxml2" version="2.0">
+  <namespace name="libxml2" version="2.0"
+	     c:identifier-prefixes="xml"
+	     c:symbol-prefixes="xml">
     <record name="Node" c:type="xmlNode"/>
     <record name="NodePtr" c:type="xmlNodePtr"/>
     <record name="Doc" c:type="xmlDoc"/>
diff --git a/gir/xfixes-4.0.gir b/gir/xfixes-4.0.gir
index 7a0fa18e..2ffe968a 100644
--- a/gir/xfixes-4.0.gir
+++ b/gir/xfixes-4.0.gir
@@ -2,7 +2,9 @@
 <repository version="1.2"
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0">
-  <namespace name="xfixes" version="4.0">
+  <namespace name="xfixes" version="4.0"
+	     c:identifier-prefixes="X"
+	     c:symbol-prefixes="X">
     <record name="XserverRegion" c:type="XserverRegion"/>
   </namespace>
 </repository>
diff --git a/gir/xft-2.0.gir b/gir/xft-2.0.gir
index 1117847d..83e1e847 100644
--- a/gir/xft-2.0.gir
+++ b/gir/xft-2.0.gir
@@ -2,7 +2,10 @@
 <repository version="1.2"
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0">
-  <namespace name="xft" version="2.0">
+  <include name="xlib" version="2.0"/>
+  <namespace name="xft" version="2.0"
+	     c:identifier-prefixes="Xft"
+	     c:symbol-prefixes="Xft">
     <record name="Color" c:type="XftColor"/>
     <record name="Draw" c:type="XftDraw"/>
     <record name="Font" c:type="XftFont"/>
diff --git a/gir/xlib-2.0.gir b/gir/xlib-2.0.gir
index 10816521..95cdc74f 100644
--- a/gir/xlib-2.0.gir
+++ b/gir/xlib-2.0.gir
@@ -2,7 +2,9 @@
 <repository version="1.2"
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0">
-  <namespace name="xlib" version="2.0">
+  <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"/>
diff --git a/gir/xrandr-1.3.gir b/gir/xrandr-1.3.gir
index d8844da1..2e62e98e 100644
--- a/gir/xrandr-1.3.gir
+++ b/gir/xrandr-1.3.gir
@@ -2,7 +2,9 @@
 <repository version="1.2"
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0">
-  <namespace name="xrandr" version="1.3">
+  <namespace name="xrandr" version="1.3"
+	     c:identifier-prefixes="XRR"
+	     c:symbol-prefixes="XRR">
     <record name="ScreenSize" c:type="XRRScreenSize"/>
     <record name="ScreenChangeNotifyEvent" c:type="XRRScreenChangeNotifyEvent"/>
     <record name="NotifyEvent" c:type="XRRNotifyEvent"/>