diff --git a/ChangeLog b/ChangeLog
index ce4484df6..fd3938db0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-22  Peter Johanson  <peter@peterjohanson.com>
+
+	* gtk/TreeModelAdapter.custom:
+	* gtk/TreeModelFilter.custom:
+	* gtk/TreeModelSort.custom:
+	* gtk/TreeStore.custom: Don't trigger any gtk+ critical
+	warnings when the 'rows-reodered' signal is fired.
+
 2008-10-21  Mike Kestner  <mkestner@novell.com>
 
 	* cairo/*: add a policy assembly for 1.0 defering to 2.0.
diff --git a/gtk/TreeModelAdapter.custom b/gtk/TreeModelAdapter.custom
index 9984965f2..9d206e260 100644
--- a/gtk/TreeModelAdapter.custom
+++ b/gtk/TreeModelAdapter.custom
@@ -92,7 +92,7 @@
 				args.Args = new object[3];
 				args.Args[0] = arg1 == IntPtr.Zero ? null : (Gtk.TreePath) GLib.Opaque.GetOpaque (arg1, typeof (Gtk.TreePath), false);
 				args.Args[1] = Gtk.TreeIter.New (arg2);
-				int child_cnt = sender.IterNChildren ((TreeIter)args.Args[1]);
+				int child_cnt = arg2 == IntPtr.Zero ? sender.IterNChildren () : sender.IterNChildren ((TreeIter)args.Args[1]);
 				int[] new_order = new int [child_cnt];
 				Marshal.Copy (arg3, new_order, 0, child_cnt);
 				args.Args[2] = new_order;
diff --git a/gtk/TreeModelFilter.custom b/gtk/TreeModelFilter.custom
index 9e513d91d..b14602b3e 100644
--- a/gtk/TreeModelFilter.custom
+++ b/gtk/TreeModelFilter.custom
@@ -96,7 +96,7 @@
 				args.Args = new object[3];
 				args.Args[0] = arg1 == IntPtr.Zero ? null : (Gtk.TreePath) GLib.Opaque.GetOpaque (arg1, typeof (Gtk.TreePath), false);
 				args.Args[1] = Gtk.TreeIter.New (arg2);
-				int child_cnt = sender.IterNChildren ((TreeIter)args.Args[1]);
+				int child_cnt = arg2 == IntPtr.Zero ? sender.IterNChildren () : sender.IterNChildren ((TreeIter)args.Args[1]);
 				int[] new_order = new int [child_cnt];
 				Marshal.Copy (arg3, new_order, 0, child_cnt);
 				args.Args[2] = new_order;
diff --git a/gtk/TreeModelSort.custom b/gtk/TreeModelSort.custom
index 48e6820e4..8e4331cf2 100644
--- a/gtk/TreeModelSort.custom
+++ b/gtk/TreeModelSort.custom
@@ -110,7 +110,7 @@
 				args.Args = new object[3];
 				args.Args[0] = arg1 == IntPtr.Zero ? null : (Gtk.TreePath) GLib.Opaque.GetOpaque (arg1, typeof (Gtk.TreePath), false);
 				args.Args[1] = Gtk.TreeIter.New (arg2);
-				int child_cnt = sender.IterNChildren ((TreeIter)args.Args[1]);
+				int child_cnt = arg2 == IntPtr.Zero ? sender.IterNChildren () : sender.IterNChildren ((TreeIter)args.Args[1]);
 				int[] new_order = new int [child_cnt];
 				Marshal.Copy (arg3, new_order, 0, child_cnt);
 				args.Args[2] = new_order;
diff --git a/gtk/TreeStore.custom b/gtk/TreeStore.custom
index 8b2551dc4..1d82be605 100644
--- a/gtk/TreeStore.custom
+++ b/gtk/TreeStore.custom
@@ -418,7 +418,7 @@
 				args.Args = new object[3];
 				args.Args[0] = arg1 == IntPtr.Zero ? null : (Gtk.TreePath) GLib.Opaque.GetOpaque (arg1, typeof (Gtk.TreePath), false);
 				args.Args[1] = Gtk.TreeIter.New (arg2);
-				int child_cnt = sender.IterNChildren ((TreeIter)args.Args[1]);
+				int child_cnt = arg2 == IntPtr.Zero ? sender.IterNChildren () : sender.IterNChildren ((TreeIter)args.Args[1]);
 				int[] new_order = new int [child_cnt];
 				Marshal.Copy (arg3, new_order, 0, child_cnt);
 				args.Args[2] = new_order;