From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Wed, 14 Jun 2006 13:32:49 +0000 (+0000)
Subject: Fix 344838
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=400101a108f47b563c36af67e518b2b6d12aeb3a;p=~andy%2Fgtk

Fix 344838
---

diff --git a/ChangeLog b/ChangeLog
index 55f2382bd..1d5de3cc7 100644
--- 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 55f2382bd..1d5de3cc7 100644
--- 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 5c832f7b5..c2058a3a5 100644
--- 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);