From 35b60b19eb24a8d0f224e1533944eee1a8892ec2 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Fri, 11 Feb 2011 14:04:11 -0600
Subject: [PATCH] Ignore volatile on func param parse.

* gio/gio-api.raw: reparse
* parser/gapi2xml.pl: ignore volatile keyword on function parameters.
---
 gio/gio-api.raw    | 8 ++++----
 parser/gapi2xml.pl | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gio/gio-api.raw b/gio/gio-api.raw
index d54776e80..9139e1742 100644
--- a/gio/gio-api.raw
+++ b/gio/gio-api.raw
@@ -6030,7 +6030,7 @@
         <parameters>
           <parameter type="GDBusMessage*" name="message" />
           <parameter type="GDBusSendMessageFlags" name="flags" />
-          <parameter type="volatile" name="guint32*" />
+          <parameter type="guint32*" name="out_serial" />
           <parameter type="GError**" name="error" />
         </parameters>
       </method>
@@ -6040,7 +6040,7 @@
           <parameter type="GDBusMessage*" name="message" />
           <parameter type="GDBusSendMessageFlags" name="flags" />
           <parameter type="gint" name="timeout_msec" />
-          <parameter type="volatile" name="guint32*" />
+          <parameter type="guint32*" name="out_serial" />
           <parameter type="GCancellable*" name="cancellable" />
           <parameter type="GAsyncReadyCallback" name="callback" />
           <parameter type="gpointer" name="user_data" />
@@ -6059,7 +6059,7 @@
           <parameter type="GDBusMessage*" name="message" />
           <parameter type="GDBusSendMessageFlags" name="flags" />
           <parameter type="gint" name="timeout_msec" />
-          <parameter type="volatile" name="guint32*" />
+          <parameter type="guint32*" name="out_serial" />
           <parameter type="GCancellable*" name="cancellable" />
           <parameter type="GError**" name="error" />
         </parameters>
@@ -12687,7 +12687,7 @@
         <return-type type="void" />
         <parameters>
           <parameter type="const-gchar*" name="error_domain_quark_name" />
-          <parameter type="volatile" name="gsize*" />
+          <parameter type="gsize*" name="quark_volatile" />
           <parameter type="const-GDBusErrorEntry*" name="entries" />
           <parameter type="guint" name="num_entries" />
         </parameters>
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index 412286a85..60f7cdd51 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -902,6 +902,7 @@ sub addParamsElem
 		$parm =~ s/(\w+)\s+const\s*\*/const \1\*/g;
 		$parm =~ s/const\s+/const-/g;
 		$parm =~ s/unsigned\s+/unsigned-/g;
+		$parm =~ s/\bvolatile\s+//g;
 		if ($parm =~ /(.*)\(\s*\**\s*(\w+)\)\s+\((.*)\)/) {
 			my $ret = $1; my $cbn = $2; my $params = $3;
 			my $type = $parent->getAttribute('name') . StudlyCaps($cbn);