Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkTreeView: Make a search window destroy helper

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=756780
This commit is contained in:
Jonas Ådahl
2015-10-18 21:12:59 +08:00
committed by Matthias Clasen
parent ea449a032a
commit 3a53352afe
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtktreeview.c
View File

@@ -2107,6 +2107,16 @@ gtk_tree_view_free_rbtree (GtkTreeView *tree_view)
tree_view->priv->prelight_node = NULL;
}
static void
gtk_tree_view_destroy_search_window (GtkTreeView *tree_view)
{
gtk_widget_destroy (tree_view->priv->search_window);
tree_view->priv->search_window = NULL;
tree_view->priv->search_entry = NULL;
tree_view->priv->search_entry_changed_id = 0;
}
static void
gtk_tree_view_destroy (GtkWidget *widget)
{
@@ -2181,9 +2191,7 @@ gtk_tree_view_destroy (GtkWidget *widget)
/* destroy interactive search dialog */
if (tree_view->priv->search_window)
{
gtk_widget_destroy (tree_view->priv->search_window);
tree_view->priv->search_window = NULL;
tree_view->priv->search_entry = NULL;
gtk_tree_view_destroy_search_window (tree_view);
if (tree_view->priv->typeselect_flush_timeout)
{
g_source_remove (tree_view->priv->typeselect_flush_timeout);
@@ -15011,10 +15019,7 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
}
else if (tree_view->priv->search_window)
{
gtk_widget_destroy (tree_view->priv->search_window);
tree_view->priv->search_window = NULL;
tree_view->priv->search_entry_changed_id = 0;
gtk_tree_view_destroy_search_window (tree_view);
}
if (entry)