From fb1256d2f34b86eca8633f0c9568e9c1b05986ed Mon Sep 17 00:00:00 2001
From: Rachel Hestilow <hestilow@mono-cvs.ximian.com>
Date: Sat, 13 Jul 2002 20:31:23 +0000
Subject: [PATCH] 2002-07-13  Rachel Hestilow  <hestilow@ximian.com>

	* parser/Gnome.metadata, Gtk.metadata: More conflict
	fixes.
	* parser/build.pl: Fully qualify all lib names. (Gtk+ packages
	are now LFS-compliant in Debian...)
	* parser/gapi2xml.pl: Fix for whitespace in fields, defines,
	and docs.

	* generator/BoxedGen.cs: Remove extraneous CallByName definition,
	add "override" keyword to FromNative.
	(Generate): Generate methods after fields.
	* generator/ClassBase.cs: Change CallByName, FromNative to virtual.
	(.ctor): Ignore "hidden" nodes. Set container on signal.
	(GenSignals, GenMethods): Add "implementor" argument for interface
	use.
	(Get(Method|Signal|Property)Recursively): Rework to correctly
	recurse interfaces.
	(Implements): Added.
	* generator/Ctor.cs (Initialize): Move clash initialization completely
	out of Generate, so we can check for collisions.
	* generator/Method.cs (GenerateDeclCommon): Check for duplicates,
	for "new" keyword.
	(Generate): Add "implementor" argument.
	* generator/ObjectGen.cs (Generate): Initialize ctor clashes on
	this and all parents, before generating.
	(Ctors, InitializeCtors): Added.
	* generator/Signal.cs: Store the container_type, check for
	collisions.
	* generator/StructGen.cs: Add "override" keyword to overriden methods.

	* gtk/FileSelection.custom (ActionArea): Add "new" keyword.

svn path=/trunk/gtk-sharp/; revision=5782
---
 ChangeLog                |  33 +++++++
 generator/BoxedGen.cs    |  14 +--
 generator/ClassBase.cs   |  80 ++++++++++++---
 generator/Ctor.cs        |  52 +++++++---
 generator/Method.cs      |  33 ++++---
 generator/ObjectGen.cs   |  57 ++++++++---
 generator/Signal.cs      |  11 ++-
 generator/StructGen.cs   |   4 +-
 generator/gtkapi.xml     | 206 +++++++++++++++++++--------------------
 gtk/FileSelection.custom |   2 +-
 parser/Gnome.metadata    |  28 ++++++
 parser/Gtk.metadata      |  61 ++++++++++++
 parser/build.pl          |   8 +-
 parser/gapi2xml.pl       |   7 +-
 sources/Gnome.metadata   |  28 ++++++
 sources/Gtk.metadata     |  61 ++++++++++++
 16 files changed, 505 insertions(+), 180 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5302b855f..781dc18a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2002-07-13  Rachel Hestilow  <hestilow@ximian.com>
+
+	* parser/Gnome.metadata, Gtk.metadata: More conflict
+	fixes.
+	* parser/build.pl: Fully qualify all lib names. (Gtk+ packages
+	are now LFS-compliant in Debian...)
+	* parser/gapi2xml.pl: Fix for whitespace in fields, defines,
+	and docs.
+
+	* generator/BoxedGen.cs: Remove extraneous CallByName definition,
+	add "override" keyword to FromNative.
+	(Generate): Generate methods after fields.
+	* generator/ClassBase.cs: Change CallByName, FromNative to virtual.
+	(.ctor): Ignore "hidden" nodes. Set container on signal.
+	(GenSignals, GenMethods): Add "implementor" argument for interface
+	use.
+	(Get(Method|Signal|Property)Recursively): Rework to correctly
+	recurse interfaces.
+	(Implements): Added.
+	* generator/Ctor.cs (Initialize): Move clash initialization completely
+	out of Generate, so we can check for collisions.
+	* generator/Method.cs (GenerateDeclCommon): Check for duplicates,
+	for "new" keyword.
+	(Generate): Add "implementor" argument.
+	* generator/ObjectGen.cs (Generate): Initialize ctor clashes on
+	this and all parents, before generating.
+	(Ctors, InitializeCtors): Added.
+	* generator/Signal.cs: Store the container_type, check for
+	collisions.
+	* generator/StructGen.cs: Add "override" keyword to overriden methods.
+	
+	* gtk/FileSelection.custom (ActionArea): Add "new" keyword.
+	
 2002-07-11  Mike Kestner <mkestner@speakeasy.net>
 
 	* glib/SList.cs : fix a couple DllImports
diff --git a/generator/BoxedGen.cs b/generator/BoxedGen.cs
index bb667dfd5..d7bc4435d 100644
--- a/generator/BoxedGen.cs
+++ b/generator/BoxedGen.cs
@@ -15,12 +15,7 @@ namespace GtkSharp.Generation {
 		
 		public BoxedGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
 		
-		public String CallByName (String var_name)
-		{
-			return var_name + ".Handle";
-		}
-
-		public String FromNative(String var)
+		public override String FromNative(String var)
 		{
 			return "(" + QualifiedName + ") GLib.Boxed.FromNative(" + var + ")";
 		}
@@ -68,9 +63,7 @@ namespace GtkSharp.Generation {
 					break;
 					
 				case "method":
-					if (!GenMethod(member, sw)) {
-						Console.WriteLine(" in boxed " + CName);
-					}
+					//Console.WriteLine ("HIYA {0}", ((Method) member).Name);
 					break;
 					
 				default:
@@ -78,7 +71,8 @@ namespace GtkSharp.Generation {
 					break;
 				}		
 			}
-			
+
+			GenMethods (sw, null, null, false);
 			AppendCustom(sw);
 			sw.WriteLine ("\t}");
 			CloseWriter (sw);
diff --git a/generator/ClassBase.cs b/generator/ClassBase.cs
index 147d6708e..753e93041 100644
--- a/generator/ClassBase.cs
+++ b/generator/ClassBase.cs
@@ -41,6 +41,8 @@ namespace GtkSharp.Generation {
 			foreach (XmlNode node in elem.ChildNodes) {
 				if (!(node is XmlElement)) continue;
 				XmlElement member = (XmlElement) node;
+				if (member.HasAttribute ("hidden"))
+					continue;
 
 				switch (node.Name) {
 				case "method":
@@ -55,7 +57,7 @@ namespace GtkSharp.Generation {
 					break;
 
 				case "signal":
-					sigs.Add (member.GetAttribute ("name"), new Signal (member));
+					sigs.Add (member.GetAttribute ("name"), new Signal (member, this));
 					break;
 
 				case "implements":
@@ -89,12 +91,12 @@ namespace GtkSharp.Generation {
 			}
 		}
 
-		public String CallByName (String var_name)
+		public virtual String CallByName (String var_name)
 		{
 			return var_name + ".Handle";
 		}
 
-		public String FromNative(String var)
+		public virtual String FromNative(String var)
 		{
 			return "(" + QualifiedName + ") GLib.Object.GetObject(" + var + ")";
 		}
@@ -112,14 +114,14 @@ namespace GtkSharp.Generation {
 			}
 		}
 
-		public void GenSignals (StreamWriter sw, bool gen_docs)
+		public void GenSignals (StreamWriter sw, ClassBase implementor, bool gen_docs)
 		{		
 			if (sigs == null)
 				return;
 
 			foreach (Signal sig in sigs.Values) {
 				if (sig.Validate ())
-					sig.Generate (sw, gen_docs);
+					sig.Generate (sw, implementor, gen_docs);
 				else
 					Console.WriteLine(" in Object " + Name);
 			}
@@ -146,7 +148,7 @@ namespace GtkSharp.Generation {
 				     (props != null) && props.ContainsKey(mname.Substring(3)));
 		}
 
-		public void GenMethods (StreamWriter sw, Hashtable collisions, bool gen_docs)
+		public void GenMethods (StreamWriter sw, Hashtable collisions, ClassBase implementor, bool gen_docs)
 		{		
 			if (methods == null)
 				return;
@@ -165,7 +167,7 @@ namespace GtkSharp.Generation {
 						method.Name = Name + "." + method.Name;
 						method.Protection = "";
 					}
-					method.Generate (sw, gen_docs);
+					method.Generate (sw, implementor, gen_docs);
 					if (oname != null)
 					{
 						method.Name = oname;
@@ -187,16 +189,34 @@ namespace GtkSharp.Generation {
 			return (Property) props[name];
 		}
 
-		public virtual Method GetMethodRecursively (string name)
+		public Signal GetSignal (string name)
 		{
-			ClassBase klass = this;
-			Method m = null;
-			while (klass != null && m == null) {
-				m = (Method) klass.GetMethod (name);
-				klass = klass.Parent;
+			return (Signal) sigs[name];
+		}
+
+		public Method GetMethodRecursively (string name)
+		{
+			return GetMethodRecursively (name, false);
+		}
+		
+		public virtual Method GetMethodRecursively (string name, bool check_self)
+		{
+			Method p = null;
+			if (check_self)
+				p = GetMethod (name);
+			if (p == null && Parent != null) 
+				p = Parent.GetMethodRecursively (name, true);
+			
+			if (check_self && p == null && interfaces != null) {
+				foreach (string iface in interfaces) {
+					ClassBase igen = SymbolTable.GetClassGen (iface);
+					p = igen.GetMethodRecursively (name, true);
+					if (p != null)
+						break;
+				}
 			}
 
-			return m;
+			return p;
 		}
 
 		public virtual Property GetPropertyRecursively (string name)
@@ -211,5 +231,37 @@ namespace GtkSharp.Generation {
 			return p;
 		}
 
+		public Signal GetSignalRecursively (string name)
+		{
+			return GetSignalRecursively (name, false);
+		}
+		
+		public virtual Signal GetSignalRecursively (string name, bool check_self)
+		{
+			Signal p = null;
+			if (check_self)
+				p = GetSignal (name);
+			if (p == null && Parent != null) 
+				p = Parent.GetSignalRecursively (name, true);
+			
+			if (check_self && p == null && interfaces != null) {
+				foreach (string iface in interfaces) {
+					ClassBase igen = SymbolTable.GetClassGen (iface);
+					p = igen.GetSignalRecursively (name, true);
+					if (p != null)
+						break;
+				}
+			}
+
+			return p;
+		}
+
+		public bool Implements (string iface)
+		{
+			if (interfaces != null)
+				return interfaces.Contains (iface);
+			else
+				return false;
+		}
 	}
 }
diff --git a/generator/Ctor.cs b/generator/Ctor.cs
index a5cb71603..3414d1dd6 100644
--- a/generator/Ctor.cs
+++ b/generator/Ctor.cs
@@ -17,15 +17,18 @@ namespace GtkSharp.Generation {
 		private XmlElement elem;
 		private Parameters parms;
 		private bool preferred;
+		private String clashName = null;
+		private ClassBase container_type;
 
 		public bool Preferred {
 			get { return preferred; }
 			set { preferred = value; }
 		}
 		
-		public Ctor (string libname, XmlElement elem) {
+		public Ctor (string libname, XmlElement elem, ClassBase container_type) {
 			this.libname = libname;
 			this.elem = elem;
+			this.container_type = container_type;
 			XmlElement parms_elem = elem ["parameters"];
 			if (parms_elem != null)
 				parms = new Parameters (parms_elem);
@@ -53,13 +56,33 @@ namespace GtkSharp.Generation {
 			if (clash_map.ContainsKey (sigtypes)) {
 				int num = (int) clash_map[sigtypes];
 				clash_map[sigtypes] = ++num;
-				Console.WriteLine ("CLASH: {0} {1}", elem.GetAttribute ("cname"), num);
 			}
 			else
 				clash_map[sigtypes] = 0;
 		}
+
+		public void Initialize (Hashtable clash_map)
+		{
+			string sig = "()";
+			string sigtypes = "";
+			if (parms != null) {
+				sig = "(" + parms.Signature + ")";
+				sigtypes = parms.SignatureTypes;
+			}
+			int clashes = (int) clash_map[sigtypes];
+			string cname = elem.GetAttribute("cname");
+			if (clashes > 0 && !Preferred) {
+				String mname = cname.Substring(cname.IndexOf("new"));
+				mname = mname.Substring(0,1).ToUpper() + mname.Substring(1);
+				int idx;
+				while ((idx = mname.IndexOf("_")) > 0) {
+					mname = mname.Substring(0, idx) + mname.Substring(idx+1, 1).ToUpper() + mname.Substring(idx+2);
+				}
+				clashName = mname + sig;
+			}
+		}
 		
-		public void Generate (StreamWriter sw, Hashtable clash_map)
+		public void Generate (StreamWriter sw)
 		{
 			string sigtypes = "";
 			string sig = "()";
@@ -72,8 +95,6 @@ namespace GtkSharp.Generation {
 				sigtypes = parms.SignatureTypes;
 			}
 
-			int clashes = (int) clash_map[sigtypes];
-			
 			string cname = elem.GetAttribute("cname");
 			string name = ((XmlElement)elem.ParentNode).GetAttribute("name");
 			string safety;
@@ -88,15 +109,22 @@ namespace GtkSharp.Generation {
 			
 			sw.WriteLine("\t\t/// <summary> " + name + " Constructor </summary>");
 			sw.WriteLine("\t\t/// <remarks> To be completed </remarks>");
-			if (clashes > 0 && !Preferred) {
-				String mname = cname.Substring(cname.IndexOf("new"));
-				mname = mname.Substring(0,1).ToUpper() + mname.Substring(1);
-				int idx;
-				while ((idx = mname.IndexOf("_")) > 0) {
-					mname = mname.Substring(0, idx) + mname.Substring(idx+1, 1).ToUpper() + mname.Substring(idx+2);
+			if (clashName != null) {
+				string modifiers = "";
+				Ctor dup = null;
+				ObjectGen parent = (ObjectGen) container_type.Parent;
+				while (dup == null && parent != null) {
+					foreach (Ctor c in parent.Ctors) {
+						if (c.clashName == clashName) {
+							dup = c;
+							modifiers = "new ";
+							break;
+						}
+					}
+					parent = (ObjectGen) parent.Parent;
 				}
 				
-				sw.WriteLine("\t\tpublic static " + safety + name + " " + mname + sig);
+				sw.WriteLine("\t\tpublic static " + safety + modifiers +  name + " " + clashName);
 				sw.WriteLine("\t\t{");
 				if (parms != null)
 					parms.Initialize(sw, false, "");
diff --git a/generator/Method.cs b/generator/Method.cs
index c4d409876..ccedef50b 100644
--- a/generator/Method.cs
+++ b/generator/Method.cs
@@ -126,8 +126,8 @@ namespace GtkSharp.Generation {
 			else
 				safety = "";
 
-			is_get = ((parms != null && (parms.IsAccessor || (parms.Count == 0 && s_ret != "void")) || (parms == null && s_ret != "void")) && Name.Substring(0, 3) == "Get");
-			is_set = ((parms != null && (parms.IsAccessor || (parms.Count == 1 && s_ret == "void"))) && (Name.Substring(0, 3) == "Set"));
+			is_get = ((parms != null && (parms.IsAccessor || (parms.Count == 0 && s_ret != "void")) || (parms == null && s_ret != "void")) && Name.Length > 3 && Name.Substring(0, 3) == "Get");
+			is_set = ((parms != null && (parms.IsAccessor || (parms.Count == 1 && s_ret == "void"))) && (Name.Length > 3 && Name.Substring(0, 3) == "Set"));
 			
 			if (parms != null) {
 				parms.CreateSignature (is_set);
@@ -168,9 +168,20 @@ namespace GtkSharp.Generation {
 			return container_type.GetMethod (complement + elem.GetAttribute("name").Substring (1));
 		}
 		
-		private void GenerateDeclCommon (StreamWriter sw)
+		private void GenerateDeclCommon (StreamWriter sw, ClassBase implementor)
 		{
 			sw.Write(safety);
+			Method dup = null;
+			if (Name == "ToString")
+				sw.Write("override ");
+			else if (elem.HasAttribute("new_flag") || (container_type != null && (dup = container_type.GetMethodRecursively (Name)) != null) || (implementor != null && (dup = implementor.GetMethodRecursively (Name)) != null)) {
+				if (dup != null && dup.parms != null)
+					dup.parms.CreateSignature (false);
+				if (Name == "Toggle") Console.WriteLine ("FOOK {0} {1}", (dup.parms != null) ? dup.parms.Signature : null, (parms != null) ? parms.Signature : null);
+				if (dup != null && ((dup.parms != null && dup.parms.Signature == parms.Signature) || (dup.parms == null && parms == null)))
+					sw.Write("new ");
+			}
+
 			if (is_get || is_set) {
 				if (s_ret == "void")
 					s_ret = parms.AccessorReturnType;
@@ -179,8 +190,6 @@ namespace GtkSharp.Generation {
 				sw.Write(Name.Substring (3));
 				sw.WriteLine(" { ");
 			} else {
-				if (elem.HasAttribute("new_flag") || (container_type.Parent != null && container_type.Parent.GetMethodRecursively (Name) != null))
-					sw.Write("new ");
 				sw.Write(s_ret + " " + Name + sig);
 			}
 		}
@@ -199,7 +208,7 @@ namespace GtkSharp.Generation {
 					return;
 			
 				sw.Write("\t\t");
-				GenerateDeclCommon (sw);
+				GenerateDeclCommon (sw, null);
 
 				sw.Write("\t\t\t");
 				sw.Write ((is_get) ? "get;" : "set;");
@@ -214,7 +223,7 @@ namespace GtkSharp.Generation {
 			else
 			{
 				sw.Write("\t\t");
-				GenerateDeclCommon (sw);
+				GenerateDeclCommon (sw, null);
 				sw.WriteLine (";");
 			}
 
@@ -243,12 +252,12 @@ namespace GtkSharp.Generation {
 			sw.WriteLine();
 		}
 
-		public void Generate (StreamWriter sw)
+		public void Generate (StreamWriter sw, ClassBase implementor)
 		{
-			Generate (sw, true);
+			Generate (sw, implementor, true);
 		}
 		
-		public void Generate (StreamWriter sw, bool gen_docs)
+		public void Generate (StreamWriter sw, ClassBase implementor, bool gen_docs)
 		{
 			Method comp = null;
 
@@ -258,7 +267,7 @@ namespace GtkSharp.Generation {
 			/* we are generated by the get Method, if there is one */
 			if (is_set || is_get)
 			{
-				if (container_type.GetProperty (Name.Substring (3)) != null)
+				if (container_type.GetPropertyRecursively (Name.Substring (3)) != null)
 					return;
 				comp = GetComplement ();
 				if (comp != null && comp.Validate () && is_set && parms.AccessorReturnType == comp.s_ret)
@@ -285,7 +294,7 @@ namespace GtkSharp.Generation {
 			sw.Write("\t\t");
 			if (protection != "")
 				sw.Write("{0} ", protection);
-			GenerateDeclCommon (sw);
+			GenerateDeclCommon (sw, implementor);
 
 			if (is_get || is_set)
 			{
diff --git a/generator/ObjectGen.cs b/generator/ObjectGen.cs
index e5117f1b5..7a22b7e3d 100644
--- a/generator/ObjectGen.cs
+++ b/generator/ObjectGen.cs
@@ -15,6 +15,8 @@ namespace GtkSharp.Generation {
 
 		private ArrayList ctors = new ArrayList();
 		private ArrayList strings = new ArrayList();
+		private bool ctors_initted = false;
+		private Hashtable clash_map;
 
 		public ObjectGen (XmlElement ns, XmlElement elem) : base (ns, elem) 
 		{
@@ -30,7 +32,7 @@ namespace GtkSharp.Generation {
 					break;
 
 				case "constructor":
-					ctors.Add (new Ctor (LibraryName, member));
+					ctors.Add (new Ctor (LibraryName, member, this));
 					break;
 					
 				case "static-string":
@@ -63,6 +65,8 @@ namespace GtkSharp.Generation {
 				sw.Write (" : " + cs_parent);
 			if (interfaces != null) {
 				foreach (string iface in interfaces) {
+					if (Parent != null && Parent.Implements (iface))
+						continue;
 					sw.Write (", " + SymbolTable.GetCSType (iface));
 				}
 			}
@@ -86,10 +90,10 @@ namespace GtkSharp.Generation {
 			if (has_sigs && Elem.HasAttribute("parent"))
 			{
 				sw.WriteLine("\t\tprivate Hashtable Signals = new Hashtable();");
-				GenSignals (sw, true);
+				GenSignals (sw, null, true);
 			}
 
-			GenMethods (sw, null, true);
+			GenMethods (sw, null, null, true);
 			
 			if (interfaces != null) {
 				Hashtable all_methods = new Hashtable ();
@@ -105,9 +109,11 @@ namespace GtkSharp.Generation {
 				}
 					
 				foreach (string iface in interfaces) {
+					if (Parent != null && Parent.Implements (iface))
+						continue;
 					ClassBase igen = SymbolTable.GetClassGen (iface);
-					igen.GenMethods (sw, collisions, false);
-					igen.GenSignals (sw, false);
+					igen.GenMethods (sw, collisions, this, false);
+					igen.GenSignals (sw, this, false);
 				}
 			}
 
@@ -159,14 +165,14 @@ namespace GtkSharp.Generation {
 			return true;
 		}
 
-		private void GenCtors (StreamWriter sw)
-		{
-			if (!Elem.HasAttribute("parent"))
-				return;
-			sw.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
-			sw.WriteLine();
+		public ArrayList Ctors { get { return ctors; } }
 
-			Hashtable clash_map = new Hashtable();
+		private void InitializeCtors ()
+		{
+			if (ctors_initted)
+				return;
+			
+			clash_map = new Hashtable();
 
 			if (ctors != null) {
 				bool has_preferred = false;
@@ -182,10 +188,33 @@ namespace GtkSharp.Generation {
 				
 				if (!has_preferred && ctors.Count > 0)
 					((Ctor) ctors[0]).Preferred = true;
-					
+
+				foreach (Ctor ctor in ctors) 
+					if (ctor.Validate ()) {
+						ctor.Initialize (clash_map);
+					}
+			}
+
+			ctors_initted = true;
+		}
+
+		private void GenCtors (StreamWriter sw)
+		{
+			if (!Elem.HasAttribute("parent"))
+				return;
+			ObjectGen klass = this;
+			while (klass != null) {
+				klass.InitializeCtors ();
+				klass = (ObjectGen) klass.Parent;
+			}
+			
+			sw.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
+			sw.WriteLine();
+
+			if (ctors != null) {
 				foreach (Ctor ctor in ctors) {
 					if (ctor.Validate ())
-						ctor.Generate (sw, clash_map);
+						ctor.Generate (sw);
 				}
 			}
 
diff --git a/generator/Signal.cs b/generator/Signal.cs
index 5476485a2..654f5c402 100644
--- a/generator/Signal.cs
+++ b/generator/Signal.cs
@@ -16,11 +16,13 @@ namespace GtkSharp.Generation {
 		private string marsh;
 		private string name;
 		private XmlElement elem;
+		private ClassBase container_type;
 
-		public Signal (XmlElement elem) 
+		public Signal (XmlElement elem, ClassBase container_type)
 		{
 			this.elem = elem;
 			this.name = elem.GetAttribute ("name");
+			this.container_type = container_type;
 		}
 
 		public string Name {
@@ -47,8 +49,9 @@ namespace GtkSharp.Generation {
 		public void GenerateDecl (StreamWriter sw)
 		{
 			GenComments (sw);
-			if (elem.HasAttribute("new_flag"))
+			if (elem.HasAttribute("new_flag") || (container_type != null && container_type.GetSignalRecursively (Name) != null))
 				sw.Write("new ");
+
 			sw.WriteLine ("\t\tevent EventHandler " + Name + ";");
 		}
 
@@ -61,7 +64,7 @@ namespace GtkSharp.Generation {
 			sw.WriteLine("\t\t/// </remarks>");
 		}
 		
-		public void Generate (StreamWriter sw, bool gen_docs)
+		public void Generate (StreamWriter sw, ClassBase implementor, bool gen_docs)
 		{
 			string cname = "\"" + elem.GetAttribute("cname") + "\"";
 			marsh = "GtkSharp." + marsh;
@@ -69,7 +72,7 @@ namespace GtkSharp.Generation {
 			if (gen_docs)
 				GenComments (sw);
 			sw.Write("\t\tpublic ");
-			if (elem.HasAttribute("new_flag"))
+			if (elem.HasAttribute("new_flag") || (container_type != null && container_type.GetSignalRecursively (Name) != null) || (implementor != null && implementor.GetSignalRecursively (Name) != null))
 				sw.Write("new ");
 			sw.WriteLine("event EventHandler " + Name + " {");
 			sw.WriteLine("\t\t\tadd {");
diff --git a/generator/StructGen.cs b/generator/StructGen.cs
index 95e83fe1d..b778fa2c3 100644
--- a/generator/StructGen.cs
+++ b/generator/StructGen.cs
@@ -21,12 +21,12 @@ namespace GtkSharp.Generation {
 			}
 		}
 		
-		public String CallByName (String var_name)
+		public override String CallByName (String var_name)
 		{
 			return var_name;
 		}
 		
-		public String FromNative(String var)
+		public override String FromNative(String var)
 		{
 			return var;
 		}
diff --git a/generator/gtkapi.xml b/generator/gtkapi.xml
index b01e2fa0a..3b3a3f805 100644
--- a/generator/gtkapi.xml
+++ b/generator/gtkapi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <api>
-  <namespace name="Gnome" library="libgnomecanvas-2.so.0">
+  <namespace name="Gnome" library="gnomecanvas-2">
     <object name="Canvas" cname="GnomeCanvas" parent="GtkLayout">
       <field cname="root" type="GnomeCanvasItem*"/>
       <field cname="redraw_area" type="ArtUta*"/>
@@ -326,7 +326,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="const-gchar*" name="first_arg_name"/>
-          <parameter type="c"/>
+          <parameter type="c" name=""/>
         </parameters>
       </method>
       <method name="AffineAbsolute" cname="gnome_canvas_item_affine_absolute">
@@ -355,7 +355,7 @@
           <parameter type="GnomeCanvasGroup*" name="parent"/>
           <parameter type="GType" name="type"/>
           <parameter type="const-gchar*" name="first_arg_name"/>
-          <parameter type="o"/>
+          <parameter type="o" name=""/>
         </parameters>
       </constructor>
       <method name="I2cAffine" cname="gnome_canvas_item_i2c_affine">
@@ -879,7 +879,7 @@
       <field cname="bitmap" type="FT_Bitmap"/>
     </struct>
   </namespace>
-  <namespace name="Gnome" library="libgnome-2.so.0">
+  <namespace name="Gnome" library="gnome-2">
     <enum name="FileDomain" cname="GnomeFileDomain" type="enum">
       <member cname="GNOME_FILE_DOMAIN_UNKNOWN" name="Unknown"/>
       <member cname="GNOME_FILE_DOMAIN_LIBDIR" name="Libdir"/>
@@ -940,7 +940,7 @@
       <field cname="_priv" type="GnomeProgramPrivate*"/>
       <property name="PoptTable" cname="popt-table" type="gpointer" doc-string=" _(The table of options for popt)" writeable="true" construct-only="true"/>
       <property name="PoptFlags" cname="popt-flags" type="gint" doc-string=" _(The flags to use for popt)" writeable="true" construct-only="true"/>
-      <property name="PoptContext" cname="popt-context" type="gpointer" doc-string=" _(The popt context pointer that GnomeProgram is using)" readable="true"/>
+      <property name="PoptContext" cname="popt-context" type="gpointer" doc-string=" _(The popt context pointer that GnomeProgramis using)" readable="true"/>
       <property name="HumanReadableName" cname="human-readable-name" type="gchar*" doc-string=" _(Human readable name of this application)" readable="true" writeable="true" construct-only="true"/>
       <property name="GnomePath" cname="gnome-path" type="gchar*" doc-string=" _(Path in which to look for installed files)" readable="true" writeable="true" construct-only="true"/>
       <property name="AppId" cname="app-id" type="gchar*" doc-string=" _(ID string to use for this application)" readable="true"/>
@@ -948,11 +948,11 @@
       <property name="GnomePrefix" cname="gnome-prefix" type="gchar*" doc-string=" _(Prefix where GNOME was installed)" readable="true" writeable="true" construct-only="true"/>
       <property name="GnomeLibdir" cname="gnome-libdir" type="gchar*" doc-string=" _(Library prefix where GNOME was installed)" readable="true" writeable="true" construct-only="true"/>
       <property name="GnomeDatadir" cname="gnome-datadir" type="gchar*" doc-string=" _(Data prefix where GNOME was installed)" readable="true" writeable="true" construct-only="true"/>
-      <property name="GnomeSysconfdir" cname="gnome-sysconfdir" type="gchar*" doc-string=" _(Configuration prefix where GNOME was installed)" readable="true" writeable="true" construct-only="true"/>
+      <property name="GnomeSysconfdir" cname="gnome-sysconfdir" type="gchar*" doc-string=" _(Configuration prefix where GNOMEwas installed)" readable="true" writeable="true" construct-only="true"/>
       <property name="AppPrefix" cname="app-prefix" type="gchar*" doc-string=" _(Prefix where this application was installed)" readable="true" writeable="true"/>
-      <property name="AppLibdir" cname="app-libdir" type="gchar*" doc-string=" _(Library prefix where this application was installed)" readable="true" writeable="true"/>
-      <property name="AppDatadir" cname="app-datadir" type="gchar*" doc-string=" _(Data prefix where this application was installed)" readable="true" writeable="true"/>
-      <property name="AppSysconfdir" cname="app-sysconfdir" type="gchar*" doc-string=" _(Configuration prefix where this application was installed)" readable="true" writeable="true"/>
+      <property name="AppLibdir" cname="app-libdir" type="gchar*" doc-string=" _(Library prefix where this applicationwas installed)" readable="true" writeable="true"/>
+      <property name="AppDatadir" cname="app-datadir" type="gchar*" doc-string=" _(Data prefix where this applicationwas installed)" readable="true" writeable="true"/>
+      <property name="AppSysconfdir" cname="app-sysconfdir" type="gchar*" doc-string=" _(Configuration prefix where this applicationwas installed)" readable="true" writeable="true"/>
       <property name="CreateDirectories" cname="create-directories" type="gboolean" doc-string=" _(Create standard GNOME directories on startup)" readable="true" writeable="true" construct-only="true"/>
       <property name="EnableSound" cname="enable-sound" type="gboolean" doc-string=" _(Enable sound on startup)" readable="true" writeable="true" construct-only="true"/>
       <property name="Espeaker" cname="espeaker" type="gchar*" doc-string=" _(How to connect to esd)" readable="true" writeable="true" construct-only="true"/>
@@ -2148,7 +2148,7 @@
       <field cname="layout" type="PangoLayout*"/>
       <field cname="line_list_link" type="GSList*"/>
       <field cname="line" type="PangoLayoutLine*"/>
-      <field cname="at the end of the line with 0 width*/GSList* run_list_link" type="*"/>
+      <field cname="run_list_link" type="GSList*"/>
       <field cname="run" type="PangoLayoutRun*"/>
       <field cname="index" type="int"/>
       <field cname="logical_rect" type="PangoRectangle"/>
@@ -2158,7 +2158,7 @@
       <field cname="run_is_shaped" type="gboolean"/>
       <field cname="run_logical_rect" type="PangoRectangle"/>
       <field cname="ltr" type="gboolean"/>
-      <field cname="right side according to text direction*/int cluster_x" type="*"/>
+      <field cname="cluster_x" type="int"/>
       <field cname="cluster_index" type="int"/>
       <field cname="cluster_start" type="int"/>
       <field cname="next_cluster_start" type="int"/>
@@ -2356,7 +2356,7 @@
           <parameter type="gboolean" name="positions_in_pixels"/>
           <parameter type="PangoTabAlign" name="first_alignment"/>
           <parameter type="gint" name="first_position"/>
-          <parameter type="g"/>
+          <parameter type="g" name=""/>
         </parameters>
       </constructor>
       <method name="GetTab" cname="pango_tab_array_get_tab">
@@ -2423,7 +2423,7 @@
     </struct>
     <alias name="XSubfont" cname="PangoXSubfont" type="guint16 "/>
   </namespace>
-  <namespace name="Gnome" library="libgnomeui-2.so.0">
+  <namespace name="Gnome" library="gnomeui-2">
     <enum name="ClientFlags" cname="GnomeClientFlags" type="flags">
       <member cname="GNOME_CLIENT_IS_CONNECTED" name="IsConnected" value="1 &lt;&lt; 0"/>
       <member cname="GNOME_CLIENT_RESTARTED" name="Restarted" value="1 &lt;&lt; 1"/>
@@ -3051,7 +3051,7 @@
       <method name="AddStaticArg" cname="gnome_client_add_static_arg">
         <return-type type="void"/>
         <parameters>
-          <parameter type="GnomeClient *client, ..."/>
+          <parameter type="GnomeClient *client, ..." name=""/>
         </parameters>
       </method>
       <method name="RequestInteraction" cname="gnome_client_request_interaction">
@@ -3109,13 +3109,13 @@
           <parameter type="guint" name="a"/>
         </parameters>
       </signal>
-      <property name="Dither" cname="dither" type="gboolean" doc-string=" Whether or not to dither to color" readable="true" writeable="true"/>
-      <property name="UseAlpha" cname="use_alpha" type="gboolean" doc-string=" Whether or not to give the color an alpha value" readable="true" writeable="true"/>
-      <property name="Title" cname="title" type="gchar*" doc-string=" The title to give to the color picker" readable="true" writeable="true"/>
-      <property name="Red" cname="red" type="guint" doc-string=" The amount of red in the chosen color" readable="true" writeable="true"/>
-      <property name="Green" cname="green" type="guint" doc-string=" The amount of green in the chosen color" readable="true" writeable="true"/>
-      <property name="Blue" cname="blue" type="guint" doc-string=" The amount of blue in the chosen color" readable="true" writeable="true"/>
-      <property name="Alpha" cname="alpha" type="guint" doc-string=" The alpha value of the chosen color" readable="true" writeable="true"/>
+      <property name="Dither" cname="dither" type="gboolean" doc-string="Whether or not to dither to color" readable="true" writeable="true"/>
+      <property name="UseAlpha" cname="use_alpha" type="gboolean" doc-string="Whether or not to give the color an alpha value" readable="true" writeable="true"/>
+      <property name="Title" cname="title" type="gchar*" doc-string="The title to give to the color picker" readable="true" writeable="true"/>
+      <property name="Red" cname="red" type="guint" doc-string="The amount of red in the chosen color" readable="true" writeable="true"/>
+      <property name="Green" cname="green" type="guint" doc-string="The amount of green in the chosen color" readable="true" writeable="true"/>
+      <property name="Blue" cname="blue" type="guint" doc-string="The amount of blue in the chosen color" readable="true" writeable="true"/>
+      <property name="Alpha" cname="alpha" type="guint" doc-string="The alpha value of the chosen color" readable="true" writeable="true"/>
       <constructor cname="gnome_color_picker_new"/>
       <method name="GetI8" cname="gnome_color_picker_get_i8">
         <return-type type="void"/>
@@ -3201,10 +3201,10 @@
     </object>
     <object name="DateEdit" cname="GnomeDateEdit" parent="GtkHBox">
       <field cname="_priv" type="GnomeDateEditPrivate*"/>
-      <property name="Time" cname="time" type="ulong" doc-string=" _(The time currently selected)" readable="true" writeable="true"/>
-      <property name="DateeditFlags" cname="dateedit_flags" type="GnomeDateEditFlags" doc-string=" _(Flags for how DateEdit looks)" readable="true" writeable="true"/>
-      <property name="LowerHour" cname="lower_hour" type="gint" doc-string=" _(Lower hour in the time popup selector)" readable="true" writeable="true"/>
-      <property name="UpperHour" cname="upper_hour" type="gint" doc-string=" _(Upper hour in the time popup selector)" readable="true" writeable="true"/>
+      <property name="Time" cname="time" type="ulong" doc-string=" _(The time currentlyselected)" readable="true" writeable="true"/>
+      <property name="DateeditFlags" cname="dateedit_flags" type="GnomeDateEditFlags" doc-string=" _(Flags for howDateEdit looks)" readable="true" writeable="true"/>
+      <property name="LowerHour" cname="lower_hour" type="gint" doc-string=" _(Lower hour inthe time popupselector)" readable="true" writeable="true"/>
+      <property name="UpperHour" cname="upper_hour" type="gint" doc-string=" _(Upper hour inthe time popupselector)" readable="true" writeable="true"/>
       <property name="InitialTime" cname="initial_time" type="ulong" doc-string=" _(The initial time)" readable="true" writeable="true"/>
       <signal name="TimeChanged" cname="time_changed" when="FIRST">
         <return-type type="void"/>
@@ -3668,24 +3668,24 @@
           <parameter type="GnomeFileEntry*" name="fentry"/>
         </parameters>
       </signal>
-      <signal name="Activate" cname="activate" when="LAST">
+      <signal name="Activated" cname="activate" when="LAST">
         <return-type type="void"/>
         <parameters>
           <parameter type="GnomeFileEntry*" name="fentry"/>
         </parameters>
       </signal>
-      <property name="       historyId" cname="       history_id" type="gchar*" doc-string=" _(Unique identifier for the file entry. This will be used to save the history list.)" readable="true" writeable="true"/>
-      <property name="       browseDialogTitle" cname="       browse_dialog_title" type="gchar*" doc-string=" _(Title for the Browse file dialog.)" readable="true" writeable="true"/>
-      <property name="       directoryEntry" cname="       directory_entry" type="gboolean" doc-string=" _(Whether the file entry is being used to enter directory names or complete filenames.)" readable="true" writeable="true"/>
-      <property name="       modal" cname="       modal" type="gboolean" doc-string=" _(Whether the Browse file window should be modal.)" readable="true" writeable="true"/>
-      <property name="       filename" cname="       filename" type="gchar*" doc-string=" _(Filename that should be displayed in the file entry.)" readable="true" writeable="true"/>
-      <property name="       defaultPath" cname="       default_path" type="gchar*" doc-string=" _(Default path for the Browse file window.)" readable="true" writeable="true"/>
-      <property name="       gnomeEntry" cname="       gnome_entry" type="GnomeEntry" doc-string=" _(GnomeEntry that the file entry uses for entering filenames. You can use this property to get the GnomeEntry if you need to modify or query any of its parameters.)" readable="true"/>
-      <property name="       gtkEntry" cname="       gtk_entry" type="GtkEntry" doc-string=" _(GtkEntry that the file entry uses for entering filenames. You can use this property to get the GtkEntry if you need to modify or query any of its parameters.)" readable="true"/>
+      <property name="HistoryId" cname="history_id" type="gchar*" doc-string=" _(Unique identifier for the file entry.This will be used to save the history list.)" readable="true" writeable="true"/>
+      <property name="BrowseDialogTitle" cname="browse_dialog_title" type="gchar*" doc-string=" _(Title for the Browse file dialog.)" readable="true" writeable="true"/>
+      <property name="DirectoryEntry" cname="directory_entry" type="gboolean" doc-string=" _(Whether the file entry is being used toenter directory names or complete filenames.)" readable="true" writeable="true"/>
+      <property name="Modal" cname="modal" type="gboolean" doc-string=" _(Whether the Browse file window should be modal.)" readable="true" writeable="true"/>
+      <property name="Filename" cname="filename" type="gchar*" doc-string=" _(Filename that should be displayed in thefile entry.)" readable="true" writeable="true"/>
+      <property name="DefaultPath" cname="default_path" type="gchar*" doc-string=" _(Default path for the Browse file window.)" readable="true" writeable="true"/>
+      <property name="GnomeEntry" cname="gnome_entry" type="GnomeEntry" doc-string=" _(GnomeEntry that the file entry uses forentering filenames. You can use this propertyto get the GnomeEntry if you need to modifyor query any of its parameters.)" readable="true"/>
+      <property name="GtkEntry" cname="gtk_entry" type="GtkEntry" doc-string=" _(GtkEntry that the file entry uses forentering filenames. You can use this propertyto get the GtkEntry if you need to modifyor query any of its parameters.)" readable="true"/>
       <implements>
         <interface cname="GtkEditable"/>
       </implements>
-      <method name="GnomeEntry" cname="gnome_file_entry_gnome_entry">
+      <method name="GnomeEntry" cname="gnome_file_entry_gnome_entry" hidden="1">
         <return-type type="GtkWidget*"/>
       </method>
       <method name="GetFullPath" cname="gnome_file_entry_get_full_path">
@@ -3721,7 +3721,7 @@
           <parameter type="const-char*" name="filename"/>
         </parameters>
       </method>
-      <method name="GtkEntry" cname="gnome_file_entry_gtk_entry">
+      <method name="GtkEntry" cname="gnome_file_entry_gtk_entry" hidden="1">
         <return-type type="GtkWidget*"/>
       </method>
       <method name="GetDirectoryEntry" cname="gnome_file_entry_get_directory_entry">
@@ -3874,11 +3874,11 @@
           <parameter type="GnomeIconEntry*" name="ientry"/>
         </parameters>
       </signal>
-      <property name="       historyId" cname="       history_id" type="gchar*" doc-string=" _(Unique identifier for the icon entry. This will be used to save the history list.)" readable="true" writeable="true"/>
-      <property name="       browseDialogTitle" cname="       browse_dialog_title" type="gchar*" doc-string=" _(Title for the Browse icon dialog.)" readable="true" writeable="true"/>
-      <property name="       pixmapSubdir" cname="       pixmap_subdir" type="gchar*" doc-string=" _(Directory that will be searched for icons.)" readable="true" writeable="true"/>
-      <property name="       filename" cname="       filename" type="gchar*" doc-string=" _(Filename that should be displayed in the icon entry.)" readable="true" writeable="true"/>
-      <property name="       pickDialog" cname="       pick_dialog" type="GtkDialog" doc-string=" _(Icon picker dialog. You can use this property to get the GtkDialog if you need to modify or query any of its properties.)" readable="true"/>
+      <property name="HistoryId" cname="history_id" type="gchar*" doc-string=" _(Unique identifier for the icon entry.This will be used to save the history list.)" readable="true" writeable="true"/>
+      <property name="BrowseDialogTitle" cname="browse_dialog_title" type="gchar*" doc-string=" _(Title for the Browse icon dialog.)" readable="true" writeable="true"/>
+      <property name="PixmapSubdir" cname="pixmap_subdir" type="gchar*" doc-string=" _(Directory that will be searched for icons.)" readable="true" writeable="true"/>
+      <property name="Filename" cname="filename" type="gchar*" doc-string=" _(Filename that should be displayed in theicon entry.)" readable="true" writeable="true"/>
+      <property name="PickDialog" cname="pick_dialog" type="GtkDialog" doc-string=" _(Icon picker dialog. You can use this propertyto get the GtkDialog if you need to modifyor query any of its properties.)" readable="true"/>
       <constructor cname="gnome_icon_entry_new">
         <parameters>
           <parameter type="const-gchar*" name="history_id"/>
@@ -3900,7 +3900,7 @@
           <parameter type="const-gchar*" name="filename"/>
         </parameters>
       </method>
-      <method name="PickDialog" cname="gnome_icon_entry_pick_dialog">
+      <method name="PickDialog" cname="gnome_icon_entry_pick_dialog" hidden="1">
         <return-type type="GtkWidget*"/>
       </method>
       <method name="GtkEntry" cname="gnome_icon_entry_gtk_entry">
@@ -4354,7 +4354,7 @@
     </object>
     <object name="PixmapEntry" cname="GnomePixmapEntry" parent="GnomeFileEntry">
       <field cname="_priv" type="GnomePixmapEntryPrivate*"/>
-      <property name="       doPreview" cname="       do_preview" type="gboolean" doc-string=" _(Whether the pixmap entry should have a preview.)" readable="true" writeable="true"/>
+      <property name="DoPreview" cname="do_preview" type="gboolean" doc-string=" _(Whether the pixmap entry should have a preview.)" readable="true" writeable="true"/>
       <method name="PreviewWidget" cname="gnome_pixmap_entry_preview_widget">
         <return-type type="GtkWidget*"/>
       </method>
@@ -4687,7 +4687,6 @@
       <field cname="preview_sw" type="GtkWidget*"/>
       <field cname="last_preview" type="gchar*"/>
       <field cname="do_preview" bits="1" type="guint32"/>
-      <field cname="entry*/" type="the"/>
     </struct>
     <struct name="ScoresPrivate" cname="GnomeScoresPrivate">
       <field cname="but_clear" type="GtkWidget*"/>
@@ -4740,7 +4739,7 @@
       <static-string cname="GNOME_STOCK_VOLUME" name="Volume" value="gnome-stock-volume"/>
     </object>
   </namespace>
-  <namespace name="Gtk" library="libgtkhtml-3.0.so.0">
+  <namespace name="Gtk" library="gtkhtml-3.0">
     <enum name="HTMLCommandType" cname="GtkHTMLCommandType" type="enum">
       <member cname="GTK_HTML_COMMAND_UNDO" name="Undo"/>
       <member cname="GTK_HTML_COMMAND_REDO" name="Redo"/>
@@ -5079,7 +5078,7 @@
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="GtkHTML*" name="html"/>
-          <parameter type="*"/>
+          <parameter type="*" name=""/>
         </parameters>
       </signal>
       <signal name="CurrentParagraphStyleChanged" cname="current_paragraph_style_changed" when="FIRST">
@@ -7662,7 +7661,7 @@
           <parameter type="const-char*" name="filename"/>
           <parameter type="const-char*" name="type"/>
           <parameter type="GError**" name="error"/>
-          <parameter type=" "/>
+          <parameter type=" " name=""/>
         </parameters>
       </method>
       <method name="GetColorspace" cname="gdk_pixbuf_get_colorspace">
@@ -8949,7 +8948,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="G"/>
+          <parameter type="G" name=""/>
         </parameters>
       </method>
       <method name="GetIterFromString" cname="gtk_tree_model_get_iter_from_string">
@@ -9472,7 +9471,7 @@
           <parameter type="GtkButton*" name="button"/>
         </parameters>
       </signal>
-      <signal name="Activate" cname="activate" when="FIRST">
+      <signal name="Activated" cname="activate" when="FIRST">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkButton*" name="button"/>
@@ -10137,7 +10136,7 @@
         <parameters>
           <parameter type="GtkWidget*" name="widget"/>
           <parameter type="const-gchar*" name="first_prop_name"/>
-          <parameter type="c"/>
+          <parameter type="c" name=""/>
         </parameters>
       </method>
       <method name="CheckResize" cname="gtk_container_check_resize">
@@ -10171,7 +10170,7 @@
         <parameters>
           <parameter type="GtkWidget*" name="child"/>
           <parameter type="const-gchar*" name="first_prop_name"/>
-          <parameter type="c"/>
+          <parameter type="c" name=""/>
         </parameters>
       </method>
       <method name="SetFocusVadjustment" cname="gtk_container_set_focus_vadjustment">
@@ -10269,7 +10268,7 @@
         <parameters>
           <parameter type="GtkWidget*" name="child"/>
           <parameter type="const-gchar*" name="first_prop_name"/>
-          <parameter type="c"/>
+          <parameter type="c" name=""/>
         </parameters>
       </method>
       <method name="Foreach" cname="gtk_container_foreach">
@@ -10387,7 +10386,7 @@
           <parameter type="GtkWindow*" name="parent"/>
           <parameter type="GtkDialogFlags" name="flags"/>
           <parameter type="const-gchar*" name="first_button_text"/>
-          <parameter type="c"/>
+          <parameter type="c" name=""/>
         </parameters>
       </constructor>
       <method name="SetHasSeparator" cname="gtk_dialog_set_has_separator">
@@ -10433,7 +10432,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="const-gchar*" name="first_button_text"/>
-          <parameter type="c"/>
+          <parameter type="c" name=""/>
         </parameters>
       </method>
       <method name="AddButton" cname="gtk_dialog_add_button">
@@ -10504,7 +10503,7 @@
           <parameter type="GtkMenu*" name="menu"/>
         </parameters>
       </signal>
-      <signal name="Activate" cname="activate" when="LAST">
+      <signal name="Activated" cname="activate" when="LAST">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkEntry*" name="entry"/>
@@ -11495,7 +11494,7 @@
       <property name="Wrap" cname="wrap" type="gboolean" doc-string=" _(If set, wrap lines if the text becomes too wide.)" readable="true" writeable="true"/>
       <property name="Selectable" cname="selectable" type="gboolean" doc-string=" _(Whether the label text can be selected with the mouse.)" readable="true" writeable="true"/>
       <property name="MnemonicKeyval" cname="mnemonic_keyval" type="guint" doc-string=" _(The mnemonic accelerator key for this label.)" readable="true"/>
-      <property name="MnemonicWidget" cname="mnemonic_widget" type="GtkWidget" doc-string=" _(The widget to be activated when the label's mnemonic key is pressed.)" readable="true" writeable="true"/>
+      <property name="MnemonicWidget" cname="mnemonic_widget" type="GtkWidget" doc-string=" _(The widget to be activated when the label's mnemonickey is pressed.)" readable="true" writeable="true"/>
       <property name="CursorPosition" cname="cursor_position" type="gint" doc-string=" _(The current position of the insertion cursor in chars.)" readable="true"/>
       <property name="SelectionBound" cname="selection_bound" type="gint" doc-string=" _(The position of the opposite end of the selection from the cursor in chars.)" readable="true"/>
       <method name="SetAttributes" cname="gtk_label_set_attributes">
@@ -11656,7 +11655,7 @@
       <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" doc-string=" _(The GtkAdjustment for the vertical position.)" readable="true" writeable="true"/>
       <property name="Width" cname="width" type="guint" doc-string=" _(The width of the layout.)" readable="true" writeable="true"/>
       <property name="Height" cname="height" type="guint" doc-string=" _(The height of the layout.)" readable="true" writeable="true"/>
-      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST">
+      <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkLayout*" name="layout"/>
@@ -11764,7 +11763,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="G"/>
+          <parameter type="G" name=""/>
         </parameters>
       </method>
       <method name="InsertBefore" cname="gtk_list_store_insert_before">
@@ -11777,7 +11776,7 @@
       <constructor cname="gtk_list_store_new">
         <parameters>
           <parameter type="gint" name="n_columns"/>
-          <parameter type=" "/>
+          <parameter type=" " name=""/>
         </parameters>
       </constructor>
       <method name="SetValist" cname="gtk_list_store_set_valist">
@@ -12450,7 +12449,7 @@
     </object>
     <object name="Object" cname="GtkObject" parent="GObject">
       <field cname="flags" type="guint32"/>
-      <property name="UserData" cname="user_data" type="gpointer" doc-string=" Anonymous User Data Pointer" readable="true" writeable="true"/>
+      <property name="UserData" cname="user_data" type="gpointer" doc-string="Anonymous User Data Pointer" readable="true" writeable="true"/>
       <signal name="Destroyed" cname="destroy" when="CLEANUP">
         <return-type type="void"/>
         <parameters>
@@ -12467,7 +12466,7 @@
         <parameters>
           <parameter type="GtkType" name="type"/>
           <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="c"/>
+          <parameter type="c" name=""/>
         </parameters>
       </constructor>
     </object>
@@ -13968,7 +13967,7 @@
           <parameter type="const-gchar*" name="text"/>
           <parameter type="gint" name="len"/>
           <parameter type="GtkTextTag*" name="first_tag"/>
-          <parameter type="G"/>
+          <parameter type="G" name=""/>
         </parameters>
       </method>
       <method name="GetSlice" cname="gtk_text_buffer_get_slice">
@@ -14024,7 +14023,7 @@
         <parameters>
           <parameter type="const-gchar*" name="tag_name"/>
           <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="c"/>
+          <parameter type="c" name=""/>
         </parameters>
       </method>
       <method name="GetText" cname="gtk_text_buffer_get_text">
@@ -14086,7 +14085,7 @@
           <parameter type="const-gchar*" name="text"/>
           <parameter type="gint" name="len"/>
           <parameter type="const-gchar*" name="first_tag_name"/>
-          <parameter type="c"/>
+          <parameter type="c" name=""/>
         </parameters>
       </method>
       <method name="GetLineCount" cname="gtk_text_buffer_get_line_count">
@@ -14432,7 +14431,7 @@
           <parameter type="GtkDirectionType" name="direction"/>
         </parameters>
       </signal>
-      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST">
+      <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkTextView*" name="text_view"/>
@@ -15217,7 +15216,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="G"/>
+          <parameter type="G" name=""/>
         </parameters>
       </method>
       <method name="SetColumnTypes" cname="gtk_tree_store_set_column_types">
@@ -15250,7 +15249,7 @@
       <constructor cname="gtk_tree_store_new">
         <parameters>
           <parameter type="gint" name="n_columns"/>
-          <parameter type=" "/>
+          <parameter type=" " name=""/>
         </parameters>
       </constructor>
       <method name="Remove" cname="gtk_tree_store_remove">
@@ -15324,7 +15323,7 @@
       <property name="RulesHint" cname="rules_hint" type="gboolean" doc-string=" _(Set a hint to the theme engine to draw rows in alternating colors)" readable="true" writeable="true"/>
       <property name="EnableSearch" cname="enable_search" type="gboolean" doc-string=" _(View allows user to search through columns interactively)" readable="true" writeable="true"/>
       <property name="SearchColumn" cname="search_column" type="gint" doc-string=" _(Model column to search through when searching through code)" readable="true" writeable="true"/>
-      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST">
+      <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkTreeView*" name="tree_view"/>
@@ -15637,7 +15636,7 @@
           <parameter type="gint" name="position"/>
           <parameter type="const-gchar*" name="title"/>
           <parameter type="GtkCellRenderer*" name="cell"/>
-          <parameter type="G"/>
+          <parameter type="G" name=""/>
         </parameters>
       </method>
       <method name="SetEnableSearch" cname="gtk_tree_view_set_enable_search">
@@ -16009,7 +16008,7 @@
         <parameters>
           <parameter type="const-gchar*" name="title"/>
           <parameter type="GtkCellRenderer*" name="cell"/>
-          <parameter type="G"/>
+          <parameter type="G" name=""/>
         </parameters>
       </constructor>
       <method name="SetMaxWidth" cname="gtk_tree_view_column_set_max_width">
@@ -16031,7 +16030,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkCellRenderer*" name="cell_renderer"/>
-          <parameter type="G"/>
+          <parameter type="G" name=""/>
         </parameters>
       </method>
       <method name="GetAlignment" cname="gtk_tree_view_column_get_alignment">
@@ -16094,7 +16093,7 @@
       <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" doc-string=" _(The GtkAdjustment that determines the values of the horizontal position for this viewport.)" readable="true" writeable="true"/>
       <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" doc-string=" _(The GtkAdjustment that determines the values of the vertical position for this viewport.)" readable="true" writeable="true"/>
       <property name="ShadowType" cname="shadow_type" type="GtkShadowType" doc-string=" _(Determines how the shadowed box around the viewport is drawn.)" readable="true" writeable="true"/>
-      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST">
+      <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkViewport*" name="viewport"/>
@@ -16304,7 +16303,7 @@
           <parameter type="GtkWidget*" name="widget"/>
         </parameters>
       </signal>
-      <signal name="Focus" cname="focus" when="LAST">
+      <signal name="Focused" cname="focus" when="LAST">
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="GtkWidget*" name="widget"/>
@@ -16608,7 +16607,7 @@
         </parameters>
       </signal>
       <signal name="AccelClosuresChanged" cname="accel_closures_changed">
-        <return-type/>
+        <return-type type=""/>
       </signal>
       <implements>
         <interface cname="AtkImplementor"/>
@@ -16726,7 +16725,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="c"/>
+          <parameter type="c" name=""/>
         </parameters>
       </method>
       <method name="Ref" cname="gtk_widget_ref">
@@ -16824,7 +16823,7 @@
       <method name="GetExtensionEvents" cname="gtk_widget_get_extension_events">
         <return-type type="GdkExtensionMode"/>
       </method>
-      <method name="Destroyed" cname="gtk_widget_destroyed">
+      <method name="Destroyed" cname="gtk_widget_destroyed" hidden="1">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkWidget**" name="widget_pointer"/>
@@ -17098,7 +17097,7 @@
         <parameters>
           <parameter type="GtkType" name="type"/>
           <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="c"/>
+          <parameter type="c" name=""/>
         </parameters>
       </constructor>
     </object>
@@ -17737,14 +17736,12 @@
       </method>
     </boxed>
     <boxed name="IconSource" cname="GtkIconSource">
-      <field cname="the pixbuf is assumed to be the already-loaded contents of the* file.*/gchar* filename" type="*"/>
+      <field cname="filename" type="gchar*"/>
       <field cname="pixbuf" type="GdkPixbuf*"/>
       <field cname="direction" type="GtkTextDirection"/>
       <field cname="state" type="GtkStateType"/>
       <field cname="size" type="GtkIconSize"/>
-      <field cname="fields should be ignored. If FALSE" type="*"/>
-      <field cname="the parameter is* specified" type="*"/>
-      <field cname="any_direction" bits="1" type="*"/>
+      <field cname="any_direction" bits="1" type="guint"/>
       <field cname="any_state" bits="1" type="guint"/>
       <field cname="any_size" bits="1" type="guint"/>
       <method name="SetDirectionWildcarded" cname="gtk_icon_source_set_direction_wildcarded">
@@ -17906,7 +17903,7 @@
       <field cname="stepper_b" type="GdkRectangle"/>
       <field cname="stepper_c" type="GdkRectangle"/>
       <field cname="stepper_d" type="GdkRectangle"/>
-      <field cname="entire range_rect*/GdkRectangle trough" type="*"/>
+      <field cname="trough" type="GdkRectangle"/>
       <field cname="slider" type="GdkRectangle"/>
       <field cname="mouse_location" type="MouseLocation"/>
       <field cname="mouse_x" type="gint"/>
@@ -18164,12 +18161,11 @@
       <field cname="views" type="BTreeView*"/>
       <field cname="tag_infos" type="GSList*"/>
       <field cname="tag_changed_handler" type="guint"/>
-      <field cname="is added to or removed from the tree (i.e. the* length of a line may have changed" type="*"/>
-      <field cname="and lines may* have been added or removed). This invalidates* all outstanding iterators.*/guint chars_changed_stamp" type="*"/>
-      <field cname="this makes outstanding iterators recalculate their* pointed-to segment and segment offset.*/guint segments_changed_stamp" type="*"/>
+      <field cname="chars_changed_stamp" type="guint"/>
+      <field cname="segments_changed_stamp" type="guint"/>
       <field cname="last_line" type="GtkTextLine*"/>
       <field cname="last_line_stamp" type="guint"/>
-      <field cname="containing the end iterator*/GtkTextLine* end_iter_line" type="*"/>
+      <field cname="end_iter_line" type="GtkTextLine*"/>
       <field cname="end_iter_segment" type="GtkTextLineSegment*"/>
       <field cname="end_iter_segment_byte_index" type="int"/>
       <field cname="end_iter_segment_char_offset" type="int"/>
@@ -18832,18 +18828,18 @@
       <field cname="shape_mask" type="GdkBitmap*"/>
     </struct>
     <struct name="WindowGeometryInfo" cname="GtkWindowGeometryInfo">
-      <field cname="geometry" type="*/GdkGeometry"/>
+      <field cname="geometry" type="GdkGeometry"/>
       <field cname="mask" type="GdkWindowHints"/>
       <field cname="widget" type="GtkWidget*"/>
-      <field cname="we should resize to this size.*/gint resize_width" type="*"/>
+      <field cname="resize_width" type="gint"/>
       <field cname="resize_height" type="gint"/>
-      <field cname="only used if initial_pos_set*/gint initial_x" type="*"/>
+      <field cname="initial_x" type="gint"/>
       <field cname="initial_y" type="gint"/>
-      <field cname="only if &gt; 0.*/gint default_width" type="*"/>
+      <field cname="default_width" type="gint"/>
       <field cname="default_height" type="gint"/>
       <field cname="initial_pos_set" bits="1" type="guint"/>
-      <field cname="position_constraints_changed" bits="1" type="*"/>
-      <field cname="default_is_geometry" bits="1" type="*"/>
+      <field cname="position_constraints_changed" bits="1" type="guint"/>
+      <field cname="default_is_geometry" bits="1" type="guint"/>
       <field cname="last" type="GtkWindowLastGeometryInfo"/>
     </struct>
     <object name="Stock" cname="GtkStock">
@@ -19865,19 +19861,19 @@
       <field cname="role" type="AtkRole"/>
       <field cname="relation_set" type="AtkRelationSet*"/>
       <field cname="layer" type="AtkLayer"/>
-      <property name="AtkObjectNamePropertyName" cname="atk_object_name_property_name" type="gchar*" doc-string=" Object instance\'s name formatted for assistive technology access" readable="true" writeable="true"/>
-      <property name="AtkObjectNamePropertyDescription" cname="atk_object_name_property_description" type="gchar*" doc-string=" Description of an object, formatted for assistive technology access" readable="true" writeable="true"/>
-      <property name="AtkObjectNamePropertyParent" cname="atk_object_name_property_parent" type="AtkObject" doc-string=" Is used to notify that the parent has changed " readable="true" writeable="true"/>
-      <property name="AtkObjectNamePropertyValue" cname="atk_object_name_property_value" type="gdouble" doc-string=" Is used to notify that the value has changed " readable="true" writeable="true"/>
-      <property name="AtkObjectNamePropertyRole" cname="atk_object_name_property_role" type="gint" doc-string=" The accessible role of this object " readable="true" writeable="true"/>
-      <property name="AtkObjectNamePropertyComponentLayer" cname="atk_object_name_property_component_layer" type="gint" doc-string=" The accessible layer of this object " readable="true"/>
-      <property name="AtkObjectNamePropertyComponentMdiZorder" cname="atk_object_name_property_component_mdi_zorder" type="gint" doc-string=" The accessible MDI value of this object " readable="true"/>
-      <property name="AtkObjectNamePropertyTableCaption" cname="atk_object_name_property_table_caption" type="gchar*" doc-string=" Is used to notify that the table caption has changed " readable="true" writeable="true"/>
-      <property name="AtkObjectNamePropertyTableColumnHeader" cname="atk_object_name_property_table_column_header" type="AtkObject" doc-string=" Is used to notify that the table column header has changed " readable="true" writeable="true"/>
-      <property name="AtkObjectNamePropertyTableColumnDescription" cname="atk_object_name_property_table_column_description" type="gchar*" doc-string=" Is used to notify that the table columnscription has changed " readable="true" writeable="true"/>
-      <property name="AtkObjectNamePropertyTableRowHeader" cname="atk_object_name_property_table_row_header" type="AtkObject" doc-string=" Is used to notify that the table row header has changed " readable="true" writeable="true"/>
-      <property name="AtkObjectNamePropertyTableRowDescription" cname="atk_object_name_property_table_row_description" type="gchar*" doc-string=" Is used to notify that the table row description has changed " readable="true" writeable="true"/>
-      <property name="AtkObjectNamePropertyTableSummary" cname="atk_object_name_property_table_summary" type="AtkObject" doc-string=" Is used to notify that the table summary has changed " readable="true" writeable="true"/>
+      <property name="AtkObjectNamePropertyName" cname="atk_object_name_property_name" type="gchar*" doc-string="Object instance\'s name formatted forassistive technology access" readable="true" writeable="true"/>
+      <property name="AtkObjectNamePropertyDescription" cname="atk_object_name_property_description" type="gchar*" doc-string="Description of an object, formatted forassistive technology access" readable="true" writeable="true"/>
+      <property name="AtkObjectNamePropertyParent" cname="atk_object_name_property_parent" type="AtkObject" doc-string="Is used to notify that the parent has changed" readable="true" writeable="true"/>
+      <property name="AtkObjectNamePropertyValue" cname="atk_object_name_property_value" type="gdouble" doc-string="Is used to notify that the value has changed" readable="true" writeable="true"/>
+      <property name="AtkObjectNamePropertyRole" cname="atk_object_name_property_role" type="gint" doc-string="The accessible role of this object" readable="true" writeable="true"/>
+      <property name="AtkObjectNamePropertyComponentLayer" cname="atk_object_name_property_component_layer" type="gint" doc-string="The accessible layer of this object" readable="true"/>
+      <property name="AtkObjectNamePropertyComponentMdiZorder" cname="atk_object_name_property_component_mdi_zorder" type="gint" doc-string="The accessible MDI value of this object" readable="true"/>
+      <property name="AtkObjectNamePropertyTableCaption" cname="atk_object_name_property_table_caption" type="gchar*" doc-string="Is used to notify that the table caption has changed" readable="true" writeable="true"/>
+      <property name="AtkObjectNamePropertyTableColumnHeader" cname="atk_object_name_property_table_column_header" type="AtkObject" doc-string="Is used to notify that the table column header has changed" readable="true" writeable="true"/>
+      <property name="AtkObjectNamePropertyTableColumnDescription" cname="atk_object_name_property_table_column_description" type="gchar*" doc-string="Is used to notify that the table columnscription has changed" readable="true" writeable="true"/>
+      <property name="AtkObjectNamePropertyTableRowHeader" cname="atk_object_name_property_table_row_header" type="AtkObject" doc-string="Is used to notify that the table row header has changed" readable="true" writeable="true"/>
+      <property name="AtkObjectNamePropertyTableRowDescription" cname="atk_object_name_property_table_row_description" type="gchar*" doc-string="Is used to notify that the table row description has changed" readable="true" writeable="true"/>
+      <property name="AtkObjectNamePropertyTableSummary" cname="atk_object_name_property_table_summary" type="AtkObject" doc-string="Is used to notify that the table summary has changed" readable="true" writeable="true"/>
       <signal name="ChildrenChanged" cname="children_changed" when="LAST">
         <return-type type="void"/>
         <parameters>
diff --git a/gtk/FileSelection.custom b/gtk/FileSelection.custom
index 2112378ce..6b5548ca5 100644
--- a/gtk/FileSelection.custom
+++ b/gtk/FileSelection.custom
@@ -108,7 +108,7 @@ public Gtk.HButtonBox ButtonArea {
 
 [DllImport("gtksharpglue")]
 static extern IntPtr gtksharp_file_selection_get_action_area (IntPtr i);
-public Gtk.HButtonBox ActionArea {
+public new Gtk.HButtonBox ActionArea {
 	get { return new Gtk.HButtonBox (gtksharp_file_selection_get_action_area (this.Handle)); }
 }
 
diff --git a/parser/Gnome.metadata b/parser/Gnome.metadata
index 5f13a380e..1b2581313 100644
--- a/parser/Gnome.metadata
+++ b/parser/Gnome.metadata
@@ -134,6 +134,34 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GnomeFileEntry">
+    <signal>Activate</signal>
+  </class>
+  <data>
+    <attribute target="signal">
+      <name>name</name>
+      <value>Activated</value>
+    </attribute>
+  </data>
+</rule>
+
+<!-- hides -->
+<rule>
+  <class name="GnomeFileEntry">
+    <method>GnomeEntry</method>
+    <method>GtkEntry</method>
+  </class>
+  <class name="GnomeIconEntry">
+    <method>PickDialog</method>
+  </class>
+  <data>
+    <attribute target="method">
+      <name>hidden</name>
+      <value>1</value>
+    </attribute>
+  </data>
+</rule>
 
 <!-- misc -->
 <rule>
diff --git a/parser/Gtk.metadata b/parser/Gtk.metadata
index 30a5d4ec9..801d79cf1 100644
--- a/parser/Gtk.metadata
+++ b/parser/Gtk.metadata
@@ -237,6 +237,17 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GtkWidget">
+    <signal>Focus</signal>
+  </class>
+  <data>
+    <attribute target="signal">
+      <name>name</name>
+      <value>Focused</value>
+    </attribute>
+  </data>
+</rule>
 <rule>
   <class name="GtkWidget">
     <signal>SizeAllocate</signal>
@@ -598,6 +609,15 @@
   <class name="GtkMenuItem">
     <signal>Activate</signal>
   </class>
+  <class name="GtkButton">
+    <signal>Activate</signal>
+  </class>
+  <class name="GtkOldEditable">
+    <signal>Activate</signal>
+  </class>
+  <class name="GtkEntry">
+    <signal>Activate</signal>
+  </class>
   <data>
     <attribute target="signal">
       <name>name</name>
@@ -1068,6 +1088,32 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GtkCList">
+    <signal>SetScrollAdjustments</signal>
+  </class>
+  <class name="GtkLayout">
+    <signal>SetScrollAdjustments</signal>
+  </class>
+  <class name="GtkText">
+    <signal>SetScrollAdjustments</signal>
+  </class>
+  <class name="GtkTextView">
+    <signal>SetScrollAdjustments</signal>
+  </class>
+  <class name="GtkTreeView">
+    <signal>SetScrollAdjustments</signal>
+  </class>
+  <class name="GtkViewport">
+    <signal>SetScrollAdjustments</signal>
+  </class>
+  <data>
+    <attribute target="signal">
+      <name>name</name>
+      <value>ScrollAdjustmentsSet</value>
+    </attribute>
+  </data>
+</rule>
 <rule>
   <class name="GtkHTML">
     <signal>Command</signal>
@@ -1079,6 +1125,21 @@
     </attribute>
   </data>
 </rule>
+
+<!-- hides -->
+<rule>
+  <class name="GtkWidget">
+    <method>Destroyed</method>
+  </class>
+  <data>
+    <attribute target="method">
+      <name>hidden</name>
+      <value>1</value>
+    </attribute>
+  </data>
+</rule>
+
+<!-- overloads -->
 <rule>
   <class name="GtkBox">
     <method>PackStartDefaults</method>
diff --git a/parser/build.pl b/parser/build.pl
index 7256e0c63..1d74ba179 100755
--- a/parser/build.pl
+++ b/parser/build.pl
@@ -9,10 +9,10 @@ unlink ($file);
 	  "gtk+-2.0.3/gdk" => "Gdk:gdk-x11-2.0",
 	  "gtk+-2.0.3/gdk-pixbuf" => "Gdk:gdk_pixbuf-2.0",
 	  "gtk+-2.0.3/gtk" => "Gtk:gtk-x11-2.0",
-	  "libgnome-2.0.1/libgnome" => "Gnome:libgnome-2",
-	  "libgnomecanvas-2.0.1/libgnomecanvas" => "Gnome:libgnomecanvas-2",
-	   "libgnomeui-2.0.1/libgnomeui" => "Gnome:libgnomeui-2",
-	   "gtkhtml/src" => "Gtk:libgtkhtml-3.0");
+	  "libgnome-2.0.1/libgnome" => "Gnome:gnome-2",
+	  "libgnomecanvas-2.0.1/libgnomecanvas" => "Gnome:gnomecanvas-2",
+	   "libgnomeui-2.0.1/libgnomeui" => "Gnome:gnomeui-2",
+	   "gtkhtml/src" => "Gtk:gtkhtml-3.0");
 
 foreach $dir (keys %srcs) {
 	($ns, $lib) = split (/:/, $srcs{$dir});
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index 4b3608ca8..a0857ed9c 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -385,6 +385,9 @@ sub addFieldElems
 		next if ($field !~ /\S/);
 		$field =~ s/\s+(\*+)/\1 /g;
 		$field =~ s/const /const\-/g;
+		$field =~ s/.*\*\///g;
+		next if ($field !~ /\S/);
+
 		if ($field =~ /(\S+\s+\*?)\(\*\s*(.+)\)\s*\((.*)\)/) {
 			$elem = addNameElem($parent, 'callback', $2);
 			addReturnElem($elem, $1);
@@ -539,7 +542,7 @@ sub addPropElem
 	if ($defines{$name}) {
 		$name = $defines{$name};
 	} else {
-		$name =~ s/\"//g;
+		$name =~ s/\s*\"//g;
 	}
 
 	while ($params[2] !~ /(\"|NULL)\s*\)?$/) {
@@ -548,7 +551,7 @@ sub addPropElem
 		@params = (@params[0..2],@params[4..$#params]);
 	}
 	$docs = $params[2];
-	$docs =~ s/\"//g;
+	$docs =~ s/\s*\"//g;
 	$docs =~ s/\s+/ /g;
 	$mode = $params[$#params];
 
diff --git a/sources/Gnome.metadata b/sources/Gnome.metadata
index 5f13a380e..1b2581313 100644
--- a/sources/Gnome.metadata
+++ b/sources/Gnome.metadata
@@ -134,6 +134,34 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GnomeFileEntry">
+    <signal>Activate</signal>
+  </class>
+  <data>
+    <attribute target="signal">
+      <name>name</name>
+      <value>Activated</value>
+    </attribute>
+  </data>
+</rule>
+
+<!-- hides -->
+<rule>
+  <class name="GnomeFileEntry">
+    <method>GnomeEntry</method>
+    <method>GtkEntry</method>
+  </class>
+  <class name="GnomeIconEntry">
+    <method>PickDialog</method>
+  </class>
+  <data>
+    <attribute target="method">
+      <name>hidden</name>
+      <value>1</value>
+    </attribute>
+  </data>
+</rule>
 
 <!-- misc -->
 <rule>
diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata
index 30a5d4ec9..801d79cf1 100644
--- a/sources/Gtk.metadata
+++ b/sources/Gtk.metadata
@@ -237,6 +237,17 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GtkWidget">
+    <signal>Focus</signal>
+  </class>
+  <data>
+    <attribute target="signal">
+      <name>name</name>
+      <value>Focused</value>
+    </attribute>
+  </data>
+</rule>
 <rule>
   <class name="GtkWidget">
     <signal>SizeAllocate</signal>
@@ -598,6 +609,15 @@
   <class name="GtkMenuItem">
     <signal>Activate</signal>
   </class>
+  <class name="GtkButton">
+    <signal>Activate</signal>
+  </class>
+  <class name="GtkOldEditable">
+    <signal>Activate</signal>
+  </class>
+  <class name="GtkEntry">
+    <signal>Activate</signal>
+  </class>
   <data>
     <attribute target="signal">
       <name>name</name>
@@ -1068,6 +1088,32 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GtkCList">
+    <signal>SetScrollAdjustments</signal>
+  </class>
+  <class name="GtkLayout">
+    <signal>SetScrollAdjustments</signal>
+  </class>
+  <class name="GtkText">
+    <signal>SetScrollAdjustments</signal>
+  </class>
+  <class name="GtkTextView">
+    <signal>SetScrollAdjustments</signal>
+  </class>
+  <class name="GtkTreeView">
+    <signal>SetScrollAdjustments</signal>
+  </class>
+  <class name="GtkViewport">
+    <signal>SetScrollAdjustments</signal>
+  </class>
+  <data>
+    <attribute target="signal">
+      <name>name</name>
+      <value>ScrollAdjustmentsSet</value>
+    </attribute>
+  </data>
+</rule>
 <rule>
   <class name="GtkHTML">
     <signal>Command</signal>
@@ -1079,6 +1125,21 @@
     </attribute>
   </data>
 </rule>
+
+<!-- hides -->
+<rule>
+  <class name="GtkWidget">
+    <method>Destroyed</method>
+  </class>
+  <data>
+    <attribute target="method">
+      <name>hidden</name>
+      <value>1</value>
+    </attribute>
+  </data>
+</rule>
+
+<!-- overloads -->
 <rule>
   <class name="GtkBox">
     <method>PackStartDefaults</method>