AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-04 01:31:13 +00:00
Code Issues Projects Releases Wiki Activity

Make GtkEntryCompletion::match-selected arguments consistent

Browse Source 
For keynav, we were still passing it the filter model.
https://bugzilla.gnome.org/show_bug.cgi?id=640698
This commit is contained in:
Matthias Clasen 2011-01-31 10:48:40 -05:00
parent fb860a9527
commit 38f6065b2b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkentry.c
View File

@ -9586,6 +9586,8 @@ keypress_completion_out:
{ {
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model = NULL; GtkTreeModel *model = NULL;
GtkTreeModel *child_model;
GtkTreeIter child_iter;
GtkTreeSelection *sel; GtkTreeSelection *sel;
gboolean retval = TRUE; gboolean retval = TRUE;
@ -9599,9 +9601,11 @@ keypress_completion_out:
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (completion->priv->tree_view)); sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (completion->priv->tree_view));
if (gtk_tree_selection_get_selected (sel, &model, &iter)) if (gtk_tree_selection_get_selected (sel, &model, &iter))
{ {
gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model), &child_iter, &iter);
child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
g_signal_handler_block (widget, completion->priv->changed_id); g_signal_handler_block (widget, completion->priv->changed_id);
g_signal_emit_by_name (completion, "match-selected", g_signal_emit_by_name (completion, "match-selected",
model, &iter, &entry_set); child_model, &child_iter, &entry_set);
g_signal_handler_unblock (widget, completion->priv->changed_id); g_signal_handler_unblock (widget, completion->priv->changed_id);
if (!entry_set) if (!entry_set)