From f74a07b091c572f78d6f7833c8c89a9524574ea8 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sat, 10 Mar 2007 22:42:40 +0000 Subject: [PATCH] only hide the search dialog and send focus events if the search dialog is 2007-03-10 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_search_dialog_hide): only hide the search dialog and send focus events if the search dialog is currently visible. svn path=/trunk/; revision=17464 --- ChangeLog | 6 ++++++ gtk/gtktreeview.c | 13 ++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4aa766515e..f20b2e70bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-03-10 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_search_dialog_hide): only + hide the search dialog and send focus events if the search dialog + is currently visible. + 2007-03-10 Richard Hult * gdk/quartz/gdkdrawable-quartz.c: diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 61ba802cdc..e1436dacad 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -13734,11 +13734,14 @@ gtk_tree_view_search_dialog_hide (GtkWidget *search_dialog, tree_view->priv->typeselect_flush_timeout = 0; } - /* send focus-in event */ - send_focus_change (GTK_WIDGET (tree_view->priv->search_entry), FALSE); - gtk_widget_hide (search_dialog); - gtk_entry_set_text (GTK_ENTRY (tree_view->priv->search_entry), ""); - send_focus_change (GTK_WIDGET (tree_view), TRUE); + if (GTK_WIDGET_VISIBLE (search_dialog)) + { + /* send focus-in event */ + send_focus_change (GTK_WIDGET (tree_view->priv->search_entry), FALSE); + gtk_widget_hide (search_dialog); + gtk_entry_set_text (GTK_ENTRY (tree_view->priv->search_entry), ""); + send_focus_change (GTK_WIDGET (tree_view), TRUE); + } } static void