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.

diff --git a/ChangeLog b/ChangeLog
index a1fe12811a6a6a3229e39dd08b47dc005109091b..053b09acb7ab72adceb06f68cd9935f57e3d51b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a1fe12811a6a6a3229e39dd08b47dc005109091b..053b09acb7ab72adceb06f68cd9935f57e3d51b9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a1fe12811a6a6a3229e39dd08b47dc005109091b..053b09acb7ab72adceb06f68cd9935f57e3d51b9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a1fe12811a6a6a3229e39dd08b47dc005109091b..053b09acb7ab72adceb06f68cd9935f57e3d51b9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a1fe12811a6a6a3229e39dd08b47dc005109091b..053b09acb7ab72adceb06f68cd9935f57e3d51b9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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

diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index a68f21a1b9bc99a91defd96da2bfd7c5ca6e4564..f30cd30459bf473d14d403a8f33f716b11db2a18 100644 (file)
--- 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;
 }