Fix 344838

diff --git a/ChangeLog b/ChangeLog
index 55f2382bd8314e67904ca24e44050823e44e00c9..1d5de3cc7070ac830a27e46c22e958f87529c32a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-14  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_set_search_position+_func):
+       Allow NULL to reset to default.  (#344838, John Finlay)
+
        * gtk/gtkprintjob.h: Collect booleans into a bitfield
        (#344765, Christian Persch)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 55f2382bd8314e67904ca24e44050823e44e00c9..1d5de3cc7070ac830a27e46c22e958f87529c32a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-06-14  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_set_search_position+_func):
+       Allow NULL to reset to default.  (#344838, John Finlay)
+
        * gtk/gtkprintjob.h: Collect booleans into a bitfield
        (#344765, Christian Persch)
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 5c832f7b57fbb2007f586ac6124342b5189c5e6d..c2058a3a5f206e9004c15254204bd74ae3d735f3 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -13505,7 +13505,8 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
 /**
  * gtk_tree_view_set_search_position_func:
  * @tree_view: A #GtkTreeView
- * @func: the function to use to position the search dialog
+ * @func: the function to use to position the search dialog, or %NULL
+ *    to use the default search position function
  * @data: user data to pass to @func, or %NULL
  * @destroy: Destroy notifier for @data, or %NULL
  *
@@ -13520,7 +13521,6 @@ gtk_tree_view_set_search_position_func (GtkTreeView                   *tree_view
                                        GDestroyNotify                 destroy)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-  g_return_if_fail (func !=NULL);
 
   if (tree_view->priv->search_position_destroy)
     (* tree_view->priv->search_position_destroy) (tree_view->priv->search_position_user_data);