From bcf941851d0be651a5c37762968434299accd851 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Sat, 15 Jul 2006 05:22:11 +0000 Subject: [PATCH] 2006-07-15 Mike Kestner * parser/gapi2xml.pl : regex fix needed for vfs 2.15.3 parse. svn path=/trunk/gtk-sharp/; revision=62632 --- ChangeLog | 4 ++++ parser/gapi2xml.pl | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f4becded..dbb697356 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-07-15 Mike Kestner + + * parser/gapi2xml.pl : regex fix needed for vfs 2.15.3 parse. + 2006-07-15 Mike Kestner * sources/gtk-sharp-2.10-sources.xml : update to gnome 2.15.4 diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl index 556a274a6..2866211a9 100755 --- a/parser/gapi2xml.pl +++ b/parser/gapi2xml.pl @@ -970,13 +970,13 @@ sub addSignalElem return $class; } - if ($class =~ /;\s*(G_CONST_RETURN\s+)?(\w+\s*\**)\s*\(\s*\*\s*$method\)\s*\((.*?)\);/) { - $ret = $2; $parms = $3; + if ($class =~ /;\s*(\/\*< public >\*\/)?(G_CONST_RETURN\s+)?(\w+\s*\**)\s*\(\s*\*\s*$method\)\s*\((.*?)\);/) { + $ret = $3; $parms = $4; addReturnElem($sig_elem, $ret); if ($parms && ($parms ne "void")) { addParamsElem($sig_elem, split(/,/, $parms)); } - $class =~ s/;\s*(G_CONST_RETURN\s+)?\w+\s*\**\s*\(\s*\*\s*$method\)\s*\(.*?\);/;/; + $class =~ s/;\s*(\/\*< public >\*\/)?(G_CONST_RETURN\s+)?\w+\s*\**\s*\(\s*\*\s*$method\)\s*\(.*?\);/;/; } else { die "$method $class"; }