From 44265207bfe5dc273b98b3224aae466d6eb3ed2a Mon Sep 17 00:00:00 2001
From: Martin Baulig <martin@novell.com>
Date: Sun, 12 Jan 2003 17:45:19 +0000
Subject: [PATCH] 2003-01-12  Martin Baulig  <martin@ximian.com>

	* parser/gapi2xml.pl (addNameElem): Make this work if the $cname
	doesn't start with $prefix.

svn path=/trunk/gtk-sharp/; revision=10427
---
 ChangeLog          |  5 +++++
 parser/gapi2xml.pl | 13 +++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eb724edd3..e80b6a4b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-12  Martin Baulig  <martin@ximian.com>
+
+	* parser/gapi2xml.pl (addNameElem): Make this work if the $cname
+	doesn't start with $prefix.
+
 2003-01-10  Duncan Mak  <duncan@ximian.com>
 
 	* gtk/TextView.custom (WindowToBufferCoords): Remove the hack, as
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index 7ff05668f..febd39f02 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -521,11 +521,16 @@ sub addNameElem
 	my $elem = $doc->createElement($type);
 	$node->appendChild($elem);
 	if ($prefix) {
-		$cname =~ /$prefix(\w+)/;
-		if ($prepend) {
-			$name = $prepend . $1;
+		my $match;
+		if ($cname =~ /$prefix(\w+)/) {
+			$match = $1;
 		} else {
-			$name = $1;
+			$match = $cname;
+		}
+		if ($prepend) {
+			$name = $prepend . $match;
+		} else {
+			$name = $match;
 		}
 		$elem->setAttribute('name', StudlyCaps($name));
 	}