diff --git a/ChangeLog b/ChangeLog
index 5939088da9f41f44ce9235897df6e7e8e6c22965..ebe229529bac54adf41ff7bb56b9c581a3f6553a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug  3 18:38:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreemodelfilter.c: Correct the return type
+	of gtk_tree_model_filter_get_flags().  (#149195, Morten Welinder)
+
 Tue Aug  3 18:16:55 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Fix #149191, reported by Morten Welinder:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5939088da9f41f44ce9235897df6e7e8e6c22965..ebe229529bac54adf41ff7bb56b9c581a3f6553a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Aug  3 18:38:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreemodelfilter.c: Correct the return type
+	of gtk_tree_model_filter_get_flags().  (#149195, Morten Welinder)
+
 Tue Aug  3 18:16:55 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Fix #149191, reported by Morten Welinder:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5939088da9f41f44ce9235897df6e7e8e6c22965..ebe229529bac54adf41ff7bb56b9c581a3f6553a 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Aug  3 18:38:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreemodelfilter.c: Correct the return type
+	of gtk_tree_model_filter_get_flags().  (#149195, Morten Welinder)
+
 Tue Aug  3 18:16:55 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Fix #149191, reported by Morten Welinder:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5939088da9f41f44ce9235897df6e7e8e6c22965..ebe229529bac54adf41ff7bb56b9c581a3f6553a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Aug  3 18:38:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreemodelfilter.c: Correct the return type
+	of gtk_tree_model_filter_get_flags().  (#149195, Morten Welinder)
+
 Tue Aug  3 18:16:55 2004  Matthias Clasen  <maclas@gmx.de>
 
 	Fix #149191, reported by Morten Welinder:
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 48410f3bc1e3cf2e2abb3057bcfe6d93e1b9d0eb..e0e4752389bf8c0da1a1381a7a8566cb238b0b82 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -146,7 +146,7 @@ static void         gtk_tree_model_filter_rows_reordered                  (GtkTr
                                                                            gpointer                data);
 
 /* GtkTreeModel interface */
-static guint        gtk_tree_model_filter_get_flags                       (GtkTreeModel           *model);
+static GtkTreeModelFlags gtk_tree_model_filter_get_flags                       (GtkTreeModel           *model);
 static gint         gtk_tree_model_filter_get_n_columns                   (GtkTreeModel           *model);
 static GType        gtk_tree_model_filter_get_column_type                 (GtkTreeModel           *model,
                                                                            gint                    index);
@@ -1784,7 +1784,7 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model,
 }
 
 /* TreeModelIface implementation */
-static guint
+static GtkTreeModelFlags
 gtk_tree_model_filter_get_flags (GtkTreeModel *model)
 {
   GtkTreeModelFlags flags;