diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2004-06-02 19:22:26 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2004-06-02 19:22:26 +0000 |
| commit | 3ac2421694b84557d7192af61899e99e7f2731a8 (patch) | |
| tree | 827c3f58a6ed9764bdfdf9308cd7751b32f2de1c | |
| parent | 984628739626f5cae0ee5f104a77d32dec5b745c (diff) | |
| download | gdk-pixbuf-3ac2421694b84557d7192af61899e99e7f2731a8.tar.gz | |
Merged from HEAD:
2004-06-02 Federico Mena Quintero <federico@ximian.com>
Merged from HEAD:
* gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the
model is empty. Fixes #143536.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 3 |
5 files changed, 30 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2004-06-02 Federico Mena Quintero <federico@ximian.com> + + Merged from HEAD: + + * gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the + model is empty. Fixes #143536. + 2004-06-02 Matthias Clasen <mclasen@redhat.com> * gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b175ed812..739fe567d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2004-06-02 Federico Mena Quintero <federico@ximian.com> + + Merged from HEAD: + + * gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the + model is empty. Fixes #143536. + 2004-06-02 Matthias Clasen <mclasen@redhat.com> * gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b175ed812..739fe567d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2004-06-02 Federico Mena Quintero <federico@ximian.com> + + Merged from HEAD: + + * gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the + model is empty. Fixes #143536. + 2004-06-02 Matthias Clasen <mclasen@redhat.com> * gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b175ed812..739fe567d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2004-06-02 Federico Mena Quintero <federico@ximian.com> + + Merged from HEAD: + + * gtk/gtktreeview.c (gtk_tree_view_search_init): Bail out if the + model is empty. Fixes #143536. + 2004-06-02 Matthias Clasen <mclasen@redhat.com> * gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index b1178059e..c720e2209 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -12055,7 +12055,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, |