[Xfce4-commits] [xfce/thunar] 01/01: Fix pathbar match filtering (Bug #16267)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   n   d   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       x   f   c   e   -   4   .   1   4   
   in repository xfce/thunar.

commit 81bd5401c5f9573ef644bdbe01d23879149dd63f
Author: Theo Linkspfeifer <lastonestanding at tutanota.com>
Date:   Tue Feb 18 12:45:44 2020 +0100

    Fix pathbar match filtering (Bug #16267)
---
 thunar/thunar-path-entry.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/thunar/thunar-path-entry.c b/thunar/thunar-path-entry.c
index 48fa5fb..76b5b64 100644
--- a/thunar/thunar-path-entry.c
+++ b/thunar/thunar-path-entry.c
@@ -893,13 +893,14 @@ thunar_path_entry_match_func (GtkEntryCompletion *completion,
                               GtkTreeIter        *iter,
                               gpointer            user_data)
 {
-  GtkTreeModel *model;
-  const gchar  *last_slash;
-  ThunarFile   *file;
-  gboolean      matched;
-  gchar        *text_normalized;
-  gchar        *name_normalized;
-  gchar        *name;
+  GtkTreeModel    *model;
+  ThunarPathEntry *path_entry;
+  const gchar     *last_slash;
+  ThunarFile      *file;
+  gboolean         matched;
+  gchar           *text_normalized;
+  gchar           *name_normalized;
+  gchar           *name;
 
   /* determine the model from the completion */
   model = gtk_entry_completion_get_model (completion);
@@ -909,6 +910,12 @@ thunar_path_entry_match_func (GtkEntryCompletion *completion,
   if (G_UNLIKELY (model == NULL))
     return FALSE;
 
+  /* leave if the auto completion highlight was not cleared yet, to prevent
+   * https://bugzilla.xfce.org/show_bug.cgi?id=16267. */
+  path_entry = THUNAR_PATH_ENTRY (user_data);
+  if (G_UNLIKELY (path_entry->has_completion))
+    return FALSE;
+
   /* determine the current text (UTF-8 normalized) */
   text_normalized = g_utf8_normalize (gtk_entry_get_text (GTK_ENTRY (user_data)), -1, G_NORMALIZE_ALL);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.