From e6b9af39bfb89c5377f28feba1b7ce3dfd6d3579 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Mon, 28 Apr 2003 22:04:00 +0000 Subject: [PATCH] destroy the search data iff the destroy func isn't NULL. Mon Apr 28 18:03:29 2003 Jonathan Blandford * 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 +++++ gtk/gtktreeview.c | 2 +- 6 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ac5373258f..e7359b8c64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 28 17:54:39 2003 Jonathan Blandford + + * 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 * autogen.sh (have_libtool): Accept libtool-1.5. (#111480) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ac5373258f..e7359b8c64 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Apr 28 17:54:39 2003 Jonathan Blandford + + * 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 * autogen.sh (have_libtool): Accept libtool-1.5. (#111480) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ac5373258f..e7359b8c64 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Apr 28 17:54:39 2003 Jonathan Blandford + + * 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 * autogen.sh (have_libtool): Accept libtool-1.5. (#111480) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ac5373258f..e7359b8c64 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Apr 28 17:54:39 2003 Jonathan Blandford + + * 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 * autogen.sh (have_libtool): Accept libtool-1.5. (#111480) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ac5373258f..e7359b8c64 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Apr 28 17:54:39 2003 Jonathan Blandford + + * 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 * autogen.sh (have_libtool): Accept libtool-1.5. (#111480) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 53d66c22f4..513a6a62eb 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;