From 74cf801f6810001e8f29dad9bc884616a154cb5e Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Sun, 14 Mar 2004 20:44:10 +0000 Subject: [PATCH] always use the match_func, even if text_column is set. Sun Mar 14 15:38:39 2004 Jonathan Blandford * gtk/gtkentrycompletion.c (gtk_entry_completion_visible_func): always use the match_func, even if text_column is set. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkentrycompletion.c | 13 ++++++------- 6 files changed, 31 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1fe12811..053b09acb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 14 15:38:39 2004 Jonathan Blandford + + * gtk/gtkentrycompletion.c (gtk_entry_completion_visible_func): + always use the match_func, even if text_column is set. + 2004-03-14 Morten Welinder * gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a1fe12811..053b09acb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Mar 14 15:38:39 2004 Jonathan Blandford + + * gtk/gtkentrycompletion.c (gtk_entry_completion_visible_func): + always use the match_func, even if text_column is set. + 2004-03-14 Morten Welinder * gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a1fe12811..053b09acb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Mar 14 15:38:39 2004 Jonathan Blandford + + * gtk/gtkentrycompletion.c (gtk_entry_completion_visible_func): + always use the match_func, even if text_column is set. + 2004-03-14 Morten Welinder * gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a1fe12811..053b09acb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Mar 14 15:38:39 2004 Jonathan Blandford + + * gtk/gtkentrycompletion.c (gtk_entry_completion_visible_func): + always use the match_func, even if text_column is set. + 2004-03-14 Morten Welinder * gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a1fe12811..053b09acb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Mar 14 15:38:39 2004 Jonathan Blandford + + * gtk/gtkentrycompletion.c (gtk_entry_completion_visible_func): + always use the match_func, even if text_column is set. + 2004-03-14 Morten Welinder * gtk/gtkfilesystemunix.c (get_parent_dir): Don't turn "/" into diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index a68f21a1b..f30cd3045 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -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; } -- 2.43.2