diff --git a/ChangeLog b/ChangeLog
index 9b757a8cf..570d6141d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-29  Mike Kestner  <mkestner@novell.com>
+
+	* generator/ManagedCallString (Setup): use error param name instead
+	of hardcoding error.
+
 2008-01-29  Mike Kestner  <mkestner@novell.com>
 
 	* generator/VirtualMethod (CName): mangle the name.
diff --git a/generator/ManagedCallString.cs b/generator/ManagedCallString.cs
index 2405d8b1b..fdd07a063 100644
--- a/generator/ManagedCallString.cs
+++ b/generator/ManagedCallString.cs
@@ -29,7 +29,7 @@ namespace GtkSharp.Generation {
 		
 		ArrayList parms = new ArrayList ();
 		ArrayList special = new ArrayList ();
-		bool has_error;
+		string error_param = null;
 
 		public ManagedCallString (Parameters parms)
 		{
@@ -41,7 +41,7 @@ namespace GtkSharp.Generation {
 					i += 2;
 					
 				else if (p is ErrorParameter) {
-					has_error = true;
+					error_param = p.Name;
 					continue;
 				}
 				this.parms.Add (p);
@@ -59,8 +59,8 @@ namespace GtkSharp.Generation {
 		{
 			string ret = "";
 
-			if (has_error)
-				ret = indent + "error = IntPtr.Zero;\n";
+			if (error_param != null)
+				ret = indent + error_param + " = IntPtr.Zero;\n";
 
 			for (int i = 0; i < parms.Count; i ++) {
 				if ((bool)special[i] == false)