mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-25 05:01:09 +00:00
always use the match_func, even if text_column is set.
Sun Mar 14 15:38:39 2004 Jonathan Blandford <jrb@gnome.org> * gtk/gtkentrycompletion.c (gtk_entry_completion_visible_func): always use the match_func, even if text_column is set.
This commit is contained in:
parent
75b842b71f
commit
74cf801f68
@ -1,3 +1,8 @@
|
||||
Sun Mar 14 15:38:39 2004 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* gtk/gtkentrycompletion.c (gtk_entry_completion_visible_func):
|
||||
always use the match_func, even if text_column is set.
|
||||
|
||||
2004-03-14 Morten Welinder <terra@gnome.org>
|
||||
|
||||
* gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into
|
||||
|
@ -1,3 +1,8 @@
|
||||
Sun Mar 14 15:38:39 2004 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* gtk/gtkentrycompletion.c (gtk_entry_completion_visible_func):
|
||||
always use the match_func, even if text_column is set.
|
||||
|
||||
2004-03-14 Morten Welinder <terra@gnome.org>
|
||||
|
||||
* gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into
|
||||
|
@ -1,3 +1,8 @@
|
||||
Sun Mar 14 15:38:39 2004 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* gtk/gtkentrycompletion.c (gtk_entry_completion_visible_func):
|
||||
always use the match_func, even if text_column is set.
|
||||
|
||||
2004-03-14 Morten Welinder <terra@gnome.org>
|
||||
|
||||
* gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into
|
||||
|
@ -1,3 +1,8 @@
|
||||
Sun Mar 14 15:38:39 2004 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* gtk/gtkentrycompletion.c (gtk_entry_completion_visible_func):
|
||||
always use the match_func, even if text_column is set.
|
||||
|
||||
2004-03-14 Morten Welinder <terra@gnome.org>
|
||||
|
||||
* gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into
|
||||
|
@ -1,3 +1,8 @@
|
||||
Sun Mar 14 15:38:39 2004 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* gtk/gtkentrycompletion.c (gtk_entry_completion_visible_func):
|
||||
always use the match_func, even if text_column is set.
|
||||
|
||||
2004-03-14 Morten Welinder <terra@gnome.org>
|
||||
|
||||
* gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into
|
||||
|
@ -537,17 +537,16 @@ gtk_entry_completion_visible_func (GtkTreeModel *model,
|
||||
if (!completion->priv->case_normalized_key)
|
||||
return ret;
|
||||
|
||||
if (completion->priv->text_column >= 0)
|
||||
ret = gtk_entry_completion_default_completion_func (completion,
|
||||
completion->priv->case_normalized_key,
|
||||
iter,
|
||||
NULL);
|
||||
|
||||
else if (completion->priv->match_func)
|
||||
if (completion->priv->match_func)
|
||||
ret = (* completion->priv->match_func) (completion,
|
||||
completion->priv->case_normalized_key,
|
||||
iter,
|
||||
completion->priv->match_data);
|
||||
else if (completion->priv->text_column >= 0)
|
||||
ret = gtk_entry_completion_default_completion_func (completion,
|
||||
completion->priv->case_normalized_key,
|
||||
iter,
|
||||
NULL);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user