From e39080baa6c04ad517025f5cfe67a3322ac5fb04 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Thu, 18 Jul 2002 13:42:31 +0000
Subject: [PATCH] 2002-07-18  Mike Kestner <mkestner@speakeasy.net>

	* generator/StructBase.cs : Mangle field names.
	* generator/StructGen.cs : uncomment GenField.

svn path=/trunk/gtk-sharp/; revision=5892
---
 ChangeLog               | 5 +++++
 generator/StructBase.cs | 4 +++-
 generator/StructGen.cs  | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 30ed7d025..ca810f42e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-18  Mike Kestner <mkestner@speakeasy.net>
+
+	* generator/StructBase.cs : Mangle field names.
+	* generator/StructGen.cs : uncomment GenField.
+
 2002-07-18  Duncan Mak  <duncan@ximian.com>
 
 	* parser/Gtk.metadata: Mark gtk_radio_menu_item_new_with_label, 
diff --git a/generator/StructBase.cs b/generator/StructBase.cs
index 2e2766ea1..146d8086a 100644
--- a/generator/StructBase.cs
+++ b/generator/StructBase.cs
@@ -97,7 +97,7 @@ namespace GtkSharp.Generation {
 			if (field.HasAttribute("array_len")) {
 				sw.Write ("[]");
 			}
-			sw.WriteLine (" " + field.GetAttribute("cname") + ";");
+			sw.WriteLine (" " + MangleName(field.GetAttribute("cname")) + ";");
 			return true;
 		}
 
@@ -285,6 +285,8 @@ namespace GtkSharp.Generation {
 				return "evnt";
 			} else if (name == "object") {
 				return "objekt";
+			} else if (name == "in") {
+				return "inn";
 			} else {
 				return name;
 			}
diff --git a/generator/StructGen.cs b/generator/StructGen.cs
index c2bd8a707..790f58b95 100644
--- a/generator/StructGen.cs
+++ b/generator/StructGen.cs
@@ -54,8 +54,8 @@ namespace GtkSharp.Generation {
 
 				switch (node.Name) {
 				case "field":
-					Statistics.IgnoreCount++;
-					// GenField(member, sw);
+					// Statistics.IgnoreCount++;
+					GenField(member, sw);
 					break;
 					
 				case "callback":