From d53bffc04d8210bbb4ec4155d374638aad00bbdb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 8 Jun 2005 20:14:03 +0000 Subject: [PATCH] Don't crash if search_window is NULL. (#304914, Victor Osadci, testcase by 2005-06-08 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't crash if search_window is NULL. (#304914, Victor Osadci, testcase by Olaf Vitters) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtktreeview.c | 3 ++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ca185c873a..8b3d0f2ef7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-06-08 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + Don't crash if search_window is NULL. (#304914, Victor Osadci, + testcase by Olaf Vitters) + * gtk/gtkimage.c: Make the file property readable. (#170674, Lorenzo Gil Sanchez) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ca185c873a..8b3d0f2ef7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2005-06-08 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + Don't crash if search_window is NULL. (#304914, Victor Osadci, + testcase by Olaf Vitters) + * gtk/gtkimage.c: Make the file property readable. (#170674, Lorenzo Gil Sanchez) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ca185c873a..8b3d0f2ef7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2005-06-08 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + Don't crash if search_window is NULL. (#304914, Victor Osadci, + testcase by Olaf Vitters) + * gtk/gtkimage.c: Make the file property readable. (#170674, Lorenzo Gil Sanchez) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 1cc8df2cef..196cf895de 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -9011,7 +9011,8 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view, if (!tree_view->priv->enable_search && !keybinding) return FALSE; - if (GTK_WIDGET_VISIBLE (tree_view->priv->search_window)) + if (tree_view->priv->search_window != NULL && + GTK_WIDGET_VISIBLE (tree_view->priv->search_window)) return TRUE; for (list = tree_view->priv->columns; list; list = list->next)