diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-12-16 13:33:43 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-12-16 13:33:43 +0000 |
| commit | 860228fa3623c49a7bd262951fdb7ed34f3d1800 (patch) | |
| tree | 7387ec851cb588fcbe5168f74d8f0023bf704542 /gtk/gtktreeview.c | |
| parent | 521c21e0a38da70491b4c157e6c4351c735524c9 (diff) | |
| download | gtk+-860228fa3623c49a7bd262951fdb7ed34f3d1800.tar.gz | |
Don't crash if enable_search is FALSE. (#161267, Jorn Baayen)
2004-12-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Don't
crash if enable_search is FALSE. (#161267, Jorn Baayen)
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_mnemonic_activate):
Re-fix #152925, reported by Dennis Cranston.
Diffstat (limited to 'gtk/gtktreeview.c')
| -rw-r--r-- | gtk/gtktreeview.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index df546df2ec..634dfbd0bf 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -8955,6 +8955,9 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view, gboolean found_focus = FALSE; GtkWidgetClass *entry_parent_class; + if (!tree_view->priv->enable_search) + return FALSE; + if (GTK_WIDGET_VISIBLE (tree_view->priv->search_window)) return TRUE; @@ -8976,11 +8979,10 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view, if (GTK_WIDGET_HAS_FOCUS (tree_view)) found_focus = TRUE; - if (! found_focus) + if (!found_focus) return FALSE; - if (tree_view->priv->enable_search == FALSE || - tree_view->priv->search_column < 0) + if (tree_view->priv->search_column < 0) return FALSE; gtk_tree_view_ensure_interactive_directory (tree_view); |