From aff289b83a87cf9ecb3fa809db871b4d2a997fdc Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 2 Jun 2004 19:21:06 +0000 Subject: [PATCH] Bail out if the model is empty. Fixes #143536. 2004-06-02 Federico Mena Quintero * gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the model is empty. Fixes #143536. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 3 ++- 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0e85b6a8db..da80a89807 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-06-02 Federico Mena Quintero + + * gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the + model is empty. Fixes #143536. + 2004-06-02 Matthias Clasen * gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0e85b6a8db..da80a89807 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-06-02 Federico Mena Quintero + + * gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the + model is empty. Fixes #143536. + 2004-06-02 Matthias Clasen * gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0e85b6a8db..da80a89807 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-06-02 Federico Mena Quintero + + * gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the + model is empty. Fixes #143536. + 2004-06-02 Matthias Clasen * gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0e85b6a8db..da80a89807 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-06-02 Federico Mena Quintero + + * gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the + model is empty. Fixes #143536. + 2004-06-02 Matthias Clasen * gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 1321c18140..f709820eb6 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -12109,7 +12109,8 @@ gtk_tree_view_search_init (GtkWidget *entry, if (len < 1) return; - gtk_tree_model_get_iter_first (model, &iter); + if (!gtk_tree_model_get_iter_first (model, &iter)) + return; ret = gtk_tree_view_search_iter (model, selection, &iter, text,