AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't crash if enable_search is FALSE. (#161267, Jorn Baayen)

Browse Source 
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.
This commit is contained in:
Matthias Clasen 2004-12-16 13:33:43 +00:00 committed by Matthias Clasen
parent 521c21e0a3
commit 860228fa36
6 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,11 @@
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.
2004-12-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c: Add missing includes.
@ -17,6 +25,8 @@
2004-12-15 Matthias Clasen <mclasen@redhat.com>
* gtk/abicheck.sh: Strip out PRIVATE
* NEWS: Updates
* gtk/gtkmenushell.c (gtk_menu_shell_select_submenu_first)

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
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.
2004-12-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c: Add missing includes.
@ -17,6 +25,8 @@
2004-12-15 Matthias Clasen <mclasen@redhat.com>
* gtk/abicheck.sh: Strip out PRIVATE
* NEWS: Updates
* gtk/gtkmenushell.c (gtk_menu_shell_select_submenu_first)

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
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.
2004-12-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c: Add missing includes.
@ -17,6 +25,8 @@
2004-12-15 Matthias Clasen <mclasen@redhat.com>
* gtk/abicheck.sh: Strip out PRIVATE
* NEWS: Updates
* gtk/gtkmenushell.c (gtk_menu_shell_select_submenu_first)

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
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.
2004-12-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c: Add missing includes.
@ -17,6 +25,8 @@
2004-12-15 Matthias Clasen <mclasen@redhat.com>
* gtk/abicheck.sh: Strip out PRIVATE
* NEWS: Updates
* gtk/gtkmenushell.c (gtk_menu_shell_select_submenu_first)

13
gtk/gtkfilechooserbutton.c
View File

@ -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;
}

8
gtk/gtktreeview.c
View File

@ -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);