From 567e3c81e0e081e186c9e8a67bf58cf889387611 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@novell.com>
Date: Wed, 20 Apr 2011 17:32:55 -0500
Subject: [PATCH] struct padding member regex fix

* gtk/gtk-api.raw: reparse
* parser/gapi2xml.pl: match padding_n for padding members too to catch
   GtkSwitch padding vm slots.
---
 gtk/gtk-api.raw    | 14 +++++++-------
 parser/gapi2xml.pl |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gtk/gtk-api.raw b/gtk/gtk-api.raw
index bdb514a83..26a356549 100644
--- a/gtk/gtk-api.raw
+++ b/gtk/gtk-api.raw
@@ -18397,25 +18397,25 @@
       </class_struct>
       <field name="Priv" cname="priv" type="GtkSwitchPrivate*" />
       <property name="" cname="" type="class" />
-      <virtual_method name="SwitchPadding1" cname="_switch_padding_1" shared="true">
+      <virtual_method name="SwitchPadding1" cname="_switch_padding_1" shared="true" padding="true">
         <return-type type="void" />
       </virtual_method>
-      <virtual_method name="SwitchPadding2" cname="_switch_padding_2" shared="true">
+      <virtual_method name="SwitchPadding2" cname="_switch_padding_2" shared="true" padding="true">
         <return-type type="void" />
       </virtual_method>
-      <virtual_method name="SwitchPadding3" cname="_switch_padding_3" shared="true">
+      <virtual_method name="SwitchPadding3" cname="_switch_padding_3" shared="true" padding="true">
         <return-type type="void" />
       </virtual_method>
-      <virtual_method name="SwitchPadding4" cname="_switch_padding_4" shared="true">
+      <virtual_method name="SwitchPadding4" cname="_switch_padding_4" shared="true" padding="true">
         <return-type type="void" />
       </virtual_method>
-      <virtual_method name="SwitchPadding5" cname="_switch_padding_5" shared="true">
+      <virtual_method name="SwitchPadding5" cname="_switch_padding_5" shared="true" padding="true">
         <return-type type="void" />
       </virtual_method>
-      <virtual_method name="SwitchPadding6" cname="_switch_padding_6" shared="true">
+      <virtual_method name="SwitchPadding6" cname="_switch_padding_6" shared="true" padding="true">
         <return-type type="void" />
       </virtual_method>
-      <virtual_method name="SwitchPadding7" cname="_switch_padding_7" shared="true">
+      <virtual_method name="SwitchPadding7" cname="_switch_padding_7" shared="true" padding="true">
         <return-type type="void" />
       </virtual_method>
       <implements>
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index 60f7cdd51..a734b617f 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -570,7 +570,7 @@ sub addClassElem
 						$vm_elem->setAttribute('shared', 'true');
 					}
 
-					if ($cname =~ /reserved[0-9]+$/ || $cname =~ /padding[0-9]+$/ || $cname =~ /recent[0-9]+$/) {
+					if ($cname =~ /reserved_?[0-9]+$/ || $cname =~ /padding_?[0-9]+$/ || $cname =~ /recent_?[0-9]+$/) {
 						$vm_elem->setAttribute('padding', 'true');
 					}
 				}