diff --git a/ChangeLog b/ChangeLog
index fbad90c97..280e2998e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-04-17  Mike Kestner  <mkestner@novell.com>
+
+	* gtk/TreeModelAdapter.custom:
+	* gtk/TreeModelFilter.custom:
+	* gtk/TreeModelSort.custom: reworked patch from Christian Hoff to
+	throw NotImplementedException for SetValue methods.  Those should 
+	never have been added to the interface, and it's better to throw
+	an exception than have infinite recursion kill the program.
+	[Fixes #379542]
+
 2008-04-16  Mike Kestner  <mkestner@novell.com>
 
 	* gtk/Gtk.metadata: hide PrintContext.get_CairoContext.
diff --git a/gtk/TreeModelAdapter.custom b/gtk/TreeModelAdapter.custom
index a1f5d9943..9984965f2 100644
--- a/gtk/TreeModelAdapter.custom
+++ b/gtk/TreeModelAdapter.custom
@@ -42,31 +42,31 @@
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, bool value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, double value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, int value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, string value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, float value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, uint value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 		
 		public void SetValue (Gtk.TreeIter iter, int column, object value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public object GetValue (Gtk.TreeIter iter, int column) {
diff --git a/gtk/TreeModelFilter.custom b/gtk/TreeModelFilter.custom
index 5e8bb6bc4..9e513d91d 100644
--- a/gtk/TreeModelFilter.custom
+++ b/gtk/TreeModelFilter.custom
@@ -21,31 +21,31 @@
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, bool value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, double value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, int value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, string value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, float value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, uint value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 		
 		public void SetValue (Gtk.TreeIter iter, int column, object value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public object GetValue (Gtk.TreeIter iter, int column) {
diff --git a/gtk/TreeModelSort.custom b/gtk/TreeModelSort.custom
index 08e9b4c36..48e6820e4 100644
--- a/gtk/TreeModelSort.custom
+++ b/gtk/TreeModelSort.custom
@@ -44,31 +44,31 @@
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, bool value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, double value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, int value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, string value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, float value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public void SetValue (Gtk.TreeIter iter, int column, uint value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 		
 		public void SetValue (Gtk.TreeIter iter, int column, object value) {
-			SetValue (iter, column, new GLib.Value (value));
+			throw new NotImplementedException ();
 		}
 
 		public Gtk.TreeIter AppendValues (params object[] values) {