diff --git a/ChangeLog b/ChangeLog
index d6e18e28ab..eaeb7f44e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-06  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextmark.c (gtk_text_mark_get_buffer): 
+	* gtk/gtkeditable.c (gtk_editable_get_chars): 
+	* gtk/gtkctree.c (gtk_ctree_find_node_ptr): 
+	* demos/gtk-demo/main.c (demo_find_file): Fix NULL/FALSE confusion
+	(#107648, Morten Welinder)
+
 2003-03-04  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkobject.h: Add deprecation guards for gtk_object_new ().
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d6e18e28ab..eaeb7f44e9 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2003-03-06  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextmark.c (gtk_text_mark_get_buffer): 
+	* gtk/gtkeditable.c (gtk_editable_get_chars): 
+	* gtk/gtkctree.c (gtk_ctree_find_node_ptr): 
+	* demos/gtk-demo/main.c (demo_find_file): Fix NULL/FALSE confusion
+	(#107648, Morten Welinder)
+
 2003-03-04  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkobject.h: Add deprecation guards for gtk_object_new ().
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d6e18e28ab..eaeb7f44e9 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2003-03-06  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextmark.c (gtk_text_mark_get_buffer): 
+	* gtk/gtkeditable.c (gtk_editable_get_chars): 
+	* gtk/gtkctree.c (gtk_ctree_find_node_ptr): 
+	* demos/gtk-demo/main.c (demo_find_file): Fix NULL/FALSE confusion
+	(#107648, Morten Welinder)
+
 2003-03-04  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkobject.h: Add deprecation guards for gtk_object_new ().
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d6e18e28ab..eaeb7f44e9 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2003-03-06  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextmark.c (gtk_text_mark_get_buffer): 
+	* gtk/gtkeditable.c (gtk_editable_get_chars): 
+	* gtk/gtkctree.c (gtk_ctree_find_node_ptr): 
+	* demos/gtk-demo/main.c (demo_find_file): Fix NULL/FALSE confusion
+	(#107648, Morten Welinder)
+
 2003-03-04  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkobject.h: Add deprecation guards for gtk_object_new ().
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d6e18e28ab..eaeb7f44e9 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2003-03-06  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktextmark.c (gtk_text_mark_get_buffer): 
+	* gtk/gtkeditable.c (gtk_editable_get_chars): 
+	* gtk/gtkctree.c (gtk_ctree_find_node_ptr): 
+	* demos/gtk-demo/main.c (demo_find_file): Fix NULL/FALSE confusion
+	(#107648, Morten Welinder)
+
 2003-03-04  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkobject.h: Add deprecation guards for gtk_object_new ().
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 433fc1025e..545c713e7d 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -43,7 +43,7 @@ gchar *
 demo_find_file (const char *base,
 		GError    **err)
 {
-  g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
+  g_return_val_if_fail (err == NULL || *err == NULL, NULL);
   
   if (g_file_test (base, G_FILE_TEST_EXISTS))
     return g_strdup (base);
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 671e5dad30..91ddb42d02 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -4091,8 +4091,8 @@ gtk_ctree_find_node_ptr (GtkCTree    *ctree,
 {
   GtkCTreeNode *node;
   
-  g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
-  g_return_val_if_fail (ctree_row != NULL, FALSE);
+  g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
+  g_return_val_if_fail (ctree_row != NULL, NULL);
   
   if (ctree_row->parent)
     node = GTK_CTREE_ROW (ctree_row->parent)->children;
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index d15052187f..16bc0de6ac 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -122,7 +122,7 @@ gtk_editable_get_chars (GtkEditable *editable,
 			gint         start,
 			gint         end)
 {
-  g_return_val_if_fail (GTK_IS_EDITABLE (editable), FALSE);
+  g_return_val_if_fail (GTK_IS_EDITABLE (editable), NULL);
 
   return GTK_EDITABLE_GET_CLASS (editable)->get_chars (editable, start, end);
 }
diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c
index 269793654a..9338400654 100644
--- a/gtk/gtktextmark.c
+++ b/gtk/gtktextmark.c
@@ -203,7 +203,7 @@ gtk_text_mark_get_buffer (GtkTextMark *mark)
 {
   GtkTextLineSegment *seg;
 
-  g_return_val_if_fail (GTK_IS_TEXT_MARK (mark), FALSE);
+  g_return_val_if_fail (GTK_IS_TEXT_MARK (mark), NULL);
 
   seg = mark->segment;