Really fix #314890.

2005-10-03  Matthias Clasen  <mclasen@redhat.com>

	* glib-mkenums.in: Really fix #314890.

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 07dddb9..6fade6f 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib-mkenums.in: Really fix #314890.
+
 2005-09-28  Michael Natterer  <mitch@gimp.org>
 
        * gtype.h (G_IMPLEMENT_INTERFACE): revert last change, it breaks

diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
index f4bf92c..bce03ad 100755 (executable)
--- a/gobject/glib-mkenums.in
+++ b/gobject/glib-mkenums.in
@@ -267,7 +267,7 @@ while (<>) {
            (?:/\*<
              (([^*]|\*(?!/))*)
             >\s*\*/)?
-           ({)?
+           \s*({)?
          @x) {
        if (defined $2) {
            my %options = parse_trigraph ($2);
@@ -281,7 +281,7 @@ while (<>) {
       $option_lowercase_name = undef;
        }
        # Didn't have trailing '{' look on next lines
-       if (!defined $1 && !defined $3) {
+       if (!defined $1 && !defined $4) {
            while (<>) {
                if (s/^\s*\{//) {
                    last;