From 1c8652ca31c54feb9681e4161778bc76eb1acc43 Mon Sep 17 00:00:00 2001
From: Jonathan Blandford <jrb@redhat.com>
Date: Mon, 28 Apr 2003 21:54:55 +0000
Subject: [PATCH] destroy the search data iff the destroy func isn't NULL.

Mon Apr 28 17:54:39 2003  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy the search
	data iff the destroy func isn't NULL.
---
 ChangeLog                                      |  5 +++++
 ChangeLog.pre-2-10                             |  5 +++++
 ChangeLog.pre-2-4                              |  5 +++++
 ChangeLog.pre-2-6                              |  5 +++++
 ChangeLog.pre-2-8                              |  5 +++++
 docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml | 12 ++++++++++++
 gtk/gtktreeview.c                              |  2 +-
 7 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fc8bb0ff95..ebaee74e67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 28 17:54:39 2003  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy the search
+	data iff the destroy func isn't NULL.
+
 Thu Apr 24 19:12:05 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* autogen.sh (have_libtool): Accept libtool-1.5. (#111480)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fc8bb0ff95..ebaee74e67 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Apr 28 17:54:39 2003  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy the search
+	data iff the destroy func isn't NULL.
+
 Thu Apr 24 19:12:05 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* autogen.sh (have_libtool): Accept libtool-1.5. (#111480)
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fc8bb0ff95..ebaee74e67 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Apr 28 17:54:39 2003  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy the search
+	data iff the destroy func isn't NULL.
+
 Thu Apr 24 19:12:05 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* autogen.sh (have_libtool): Accept libtool-1.5. (#111480)
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fc8bb0ff95..ebaee74e67 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Apr 28 17:54:39 2003  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy the search
+	data iff the destroy func isn't NULL.
+
 Thu Apr 24 19:12:05 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* autogen.sh (have_libtool): Accept libtool-1.5. (#111480)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fc8bb0ff95..ebaee74e67 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Apr 28 17:54:39 2003  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_destroy): destroy the search
+	data iff the destroy func isn't NULL.
+
 Thu Apr 24 19:12:05 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* autogen.sh (have_libtool): Accept libtool-1.5. (#111480)
diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
index 320eca1574..551a6efed6 100644
--- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
@@ -462,6 +462,18 @@ calling gtk_tree_view_column_set_cell_data_func()
 @height: 
 
 
+<!-- ##### FUNCTION gtk_tree_view_column_cell_get_position ##### -->
+<para>
+
+</para>
+
+@tree_column: 
+@cell_renderer: 
+@start_pos: 
+@width: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_tree_view_column_cell_is_visible ##### -->
 <para>
 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 2ccf68a22d..03fee87c2f 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1180,7 +1180,7 @@ gtk_tree_view_destroy (GtkObject *object)
     gtk_tree_view_search_dialog_destroy (search_dialog,
 					 tree_view);
 
-  if (tree_view->priv->search_user_data)
+  if (tree_view->priv->search_destroy)
     {
       (* tree_view->priv->search_destroy) (tree_view->priv->search_user_data);
       tree_view->priv->search_user_data = NULL;