AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 13:11:13 +00:00
Code Issues Projects Releases Wiki Activity

always use the match_func, even if text_column is set.

Browse Source 
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:
Jonathan Blandford 2004-03-14 20:44:10 +00:00 committed by Jonathan Blandford
parent 75b842b71f
commit 74cf801f68
6 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2004-03-14 Morten Welinder <terra@gnome.org>
* gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into * gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into

5
ChangeLog.pre-2-10
View File

@ -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> 2004-03-14 Morten Welinder <terra@gnome.org>
* gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into * gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into

5
ChangeLog.pre-2-4
View File

@ -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> 2004-03-14 Morten Welinder <terra@gnome.org>
* gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into * gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into

5
ChangeLog.pre-2-6
View File

@ -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> 2004-03-14 Morten Welinder <terra@gnome.org>
* gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into * gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into

5
ChangeLog.pre-2-8
View File

@ -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> 2004-03-14 Morten Welinder <terra@gnome.org>
* gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into * gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into

13
gtk/gtkentrycompletion.c
View File

@ -537,17 +537,16 @@ gtk_entry_completion_visible_func (GtkTreeModel *model,
if (!completion->priv->case_normalized_key) if (!completion->priv->case_normalized_key)
return ret; return ret;
if (completion->priv->text_column >= 0) if (completion->priv->match_func)
ret = gtk_entry_completion_default_completion_func (completion,
completion->priv->case_normalized_key,
iter,
NULL);
else if (completion->priv->match_func)
ret = (* completion->priv->match_func) (completion, ret = (* completion->priv->match_func) (completion,
completion->priv->case_normalized_key, completion->priv->case_normalized_key,
iter, iter,
completion->priv->match_data); 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; return ret;
} }