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/gtkfilechooserbutton.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/gtkfilechooserbutton.c')
| -rw-r--r-- | gtk/gtkfilechooserbutton.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 613e7eff61..a35e91ea08 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -1008,7 +1008,18 @@ gtk_file_chooser_button_mnemonic_activate (GtkWidget *widget, GtkFileChooserButtonPrivate *priv; priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (widget); - gtk_widget_grab_focus (priv->button); + switch (gtk_file_chooser_get_action (GTK_FILE_CHOOSER (priv->dialog))) + { + case GTK_FILE_CHOOSER_ACTION_OPEN: + gtk_widget_grab_focus (priv->button); + break; + case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER: + return gtk_widget_mnemonic_activate (priv->combo_box, group_cycling); + break; + default: + g_assert_not_reached (); + break; + } return TRUE; } |