From: Dan Winship <danw@gnome.org>
Date: Fri, 14 Oct 2011 18:32:11 +0000 (-0400)
Subject: glib-mkenums.in: fix @ENUMPREFIX@ with /*< underscore_name=... >*/
X-Git-Tag: 2.31.2~159
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd4a8d333ddab043c5a6e89c0d19e56a1bdcec3e;hp=9782598b81ffe35f892bb510c27bc0d1afffaeee;p=platform%2Fupstream%2Fglib.git

glib-mkenums.in: fix @ENUMPREFIX@ with /*< underscore_name=... >*/

For enums defined with an underscore_name override, @ENUMPREFIX@
would include a trailing "_". Fix.

https://bugzilla.gnome.org/show_bug.cgi?id=661797
---

diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
index 6372245..af0304d 100755
--- a/gobject/glib-mkenums.in
+++ b/gobject/glib-mkenums.in
@@ -379,7 +379,7 @@ while (<>) {
 	    $enumshort =~ s/^[A-Z][A-Z0-9]*_//;
 
 	    $enumname_prefix = $enumlong;
-	    $enumname_prefix =~ s/$enumshort$//;
+	    $enumname_prefix =~ s/_$enumshort$//;
 	} else {
 	    # enumname is e.g. GMatchType
 	    $enspace = $enumname;