From 589681516f3580ceca8d0131faa78783f2ec18a0 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Fri, 11 Feb 2011 10:07:24 -0600
Subject: [PATCH] Strip volatile keywords in field parse.

* gio/gio-api.raw: reparse
* parser/gapi2xml.pl: strip volatile keyword from field declarations
before parsing them.
---
 gio/gio-api.raw    | 14 +++++++-------
 parser/gapi2xml.pl |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gio/gio-api.raw b/gio/gio-api.raw
index 56075dc6d..d54776e80 100644
--- a/gio/gio-api.raw
+++ b/gio/gio-api.raw
@@ -12025,7 +12025,7 @@
       </method>
     </struct>
     <struct name="DBusAnnotationInfo" cname="GDBusAnnotationInfo" opaque="true">
-      <field name="Gint" cname="gint ref_count" type="volatile" access="public" writeable="true" />
+      <field name="RefCount" cname="ref_count" type="gint" access="public" writeable="true" />
       <field name="Key" cname="key" type="gchar*" access="public" writeable="true" />
       <field name="Value" cname="value" type="gchar*" access="public" writeable="true" />
       <field name="Annotations" cname="annotations" type="GDBusAnnotationInfo**" access="public" writeable="true" />
@@ -12046,7 +12046,7 @@
       </method>
     </struct>
     <struct name="DBusArgInfo" cname="GDBusArgInfo" opaque="true">
-      <field name="Gint" cname="gint ref_count" type="volatile" access="public" writeable="true" />
+      <field name="RefCount" cname="ref_count" type="gint" access="public" writeable="true" />
       <field name="Name" cname="name" type="gchar*" access="public" writeable="true" />
       <field name="Signature" cname="signature" type="gchar*" access="public" writeable="true" />
       <field name="Annotations" cname="annotations" type="GDBusAnnotationInfo**" access="public" writeable="true" />
@@ -12065,7 +12065,7 @@
       <field name="DbusErrorName" cname="dbus_error_name" type="const-gchar*" />
     </struct>
     <struct name="DBusInterfaceInfo" cname="GDBusInterfaceInfo" opaque="true">
-      <field name="Gint" cname="gint ref_count" type="volatile" access="public" writeable="true" />
+      <field name="RefCount" cname="ref_count" type="gint" access="public" writeable="true" />
       <field name="Name" cname="name" type="gchar*" access="public" writeable="true" />
       <field name="Methods" cname="methods" type="GDBusMethodInfo**" access="public" writeable="true" />
       <field name="Signals" cname="signals" type="GDBusSignalInfo**" access="public" writeable="true" />
@@ -12113,7 +12113,7 @@
       <field name="Padding" cname="padding" array_len="8" type="gpointer" access="private" />
     </struct>
     <struct name="DBusMethodInfo" cname="GDBusMethodInfo" opaque="true">
-      <field name="Gint" cname="gint ref_count" type="volatile" access="public" writeable="true" />
+      <field name="RefCount" cname="ref_count" type="gint" access="public" writeable="true" />
       <field name="Name" cname="name" type="gchar*" access="public" writeable="true" />
       <field name="InArgs" cname="in_args" type="GDBusArgInfo**" access="public" writeable="true" />
       <field name="OutArgs" cname="out_args" type="GDBusArgInfo**" access="public" writeable="true" />
@@ -12129,7 +12129,7 @@
       </method>
     </struct>
     <struct name="DBusNodeInfo" cname="GDBusNodeInfo" opaque="true">
-      <field name="Gint" cname="gint ref_count" type="volatile" access="public" writeable="true" />
+      <field name="RefCount" cname="ref_count" type="gint" access="public" writeable="true" />
       <field name="Path" cname="path" type="gchar*" access="public" writeable="true" />
       <field name="Interfaces" cname="interfaces" type="GDBusInterfaceInfo**" access="public" writeable="true" />
       <field name="Nodes" cname="nodes" type="GDBusNodeInfo**" access="public" writeable="true" />
@@ -12164,7 +12164,7 @@
       </method>
     </struct>
     <struct name="DBusPropertyInfo" cname="GDBusPropertyInfo" opaque="true">
-      <field name="Gint" cname="gint ref_count" type="volatile" access="public" writeable="true" />
+      <field name="RefCount" cname="ref_count" type="gint" access="public" writeable="true" />
       <field name="Name" cname="name" type="gchar*" access="public" writeable="true" />
       <field name="Signature" cname="signature" type="gchar*" access="public" writeable="true" />
       <field name="Flags" cname="flags" type="GDBusPropertyInfoFlags" access="public" writeable="true" />
@@ -12180,7 +12180,7 @@
       </method>
     </struct>
     <struct name="DBusSignalInfo" cname="GDBusSignalInfo" opaque="true">
-      <field name="Gint" cname="gint ref_count" type="volatile" access="public" writeable="true" />
+      <field name="RefCount" cname="ref_count" type="gint" access="public" writeable="true" />
       <field name="Name" cname="name" type="gchar*" access="public" writeable="true" />
       <field name="Args" cname="args" type="GDBusArgInfo**" access="public" writeable="true" />
       <field name="Annotations" cname="annotations" type="GDBusAnnotationInfo**" access="public" writeable="true" />
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index 1f91af824..412286a85 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -610,6 +610,7 @@ sub addFieldElems
 		}
 		next if ($field !~ /\S/);
 		$field =~ s/GSEAL\s*\((.*)\)/\1/g;
+		$field =~ s/\bvolatile\s+//g;
 		$field =~ s/\s+(\*+)/\1 /g;
 		$field =~ s/(const\s+)?(\w+)\*\s+const\*/const \2\*/g;
 		$field =~ s/(\w+)\s+const\s*\*/const \1\*/g;