pass in user data.

Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.

	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.

ChangeLog

+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

ChangeLog.pre-2-0

+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

ChangeLog.pre-2-10

+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

ChangeLog.pre-2-2

+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

ChangeLog.pre-2-4

+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

ChangeLog.pre-2-6

+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

ChangeLog.pre-2-8

+Fri Aug 31 20:01:23 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_search_iter): pass in user data.
+
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy search_data.
+
 Wed Aug 29 20:40:58 2001  Owen Taylor  <otaylor@redhat.com>
 	* gtk/gtktextbuffer.[ch] (gtk_text_buffer_add/remove_selection_clipboard): 

gtk/gtktreeview.c

@@ -1031,6 +1031,11 @@ gtk_tree_view_destroy (GtkObject *object)
     gtk_tree_view_search_dialog_destroy (search_dialog,
 						     tree_view);
 
+  if (tree_view->priv->search_user_data)
+    {
+      (* tree_view->priv->search_destroy) (tree_view->priv->search_user_data);
+      tree_view->priv->search_user_data = NULL;
+    }
   if (GTK_OBJECT_CLASS (parent_class)->destroy)
     (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
@@ -8902,7 +8907,7 @@ gtk_tree_view_search_iter (GtkTreeModel     *model,
   GtkTreeViewColumn *column =
     gtk_tree_view_get_column (tree_view, tree_view->priv->search_column);
   
-  if (! tree_view->priv->search_equal_func (model, tree_view->priv->search_column, text, iter))
+  if (! tree_view->priv->search_equal_func (model, tree_view->priv->search_column, text, iter, tree_view->priv->search_user_data))
     {
       (*count)++;
       
@@ -8937,7 +8942,7 @@ gtk_tree_view_search_iter (GtkTreeModel     *model,
   
   while (gtk_tree_model_iter_next (model, iter))
     {
-      if (! tree_view->priv->search_equal_func (model, tree_view->priv->search_column, text, iter))
+      if (! tree_view->priv->search_equal_func (model, tree_view->priv->search_column, text, iter, tree_view->priv->search_user_data))
         {
           (*count)++;
           if (*count == n)

gtk/gtktreeview.h

@@ -119,7 +119,8 @@ typedef gboolean (* GtkTreeViewDroppableFunc)  (GtkTreeView             *tree_vi
 typedef gboolean (*GtkTreeViewSearchEqualFunc) (GtkTreeModel            *model,
 						gint                     column,
 						gchar                   *key,
-						GtkTreeIter             *iter);
+						GtkTreeIter             *iter,
+						gpointer                 search_data);
 
 
 /* Creators */