From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 7 Jul 2015 00:50:08 +0000 (-0400)
Subject: file chooser: Clear search entry when it goes away
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~9121
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=56af2358deeacff9f25faaf897adaf53c76adac0;p=gtk4.git

file chooser: Clear search entry when it goes away

Keeping the entry contents conflicts with type-to-search.
---

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index aa9ecdae71..7638930c97 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -2951,7 +2951,7 @@ operation_mode_stop (GtkFileChooserWidget *impl,
   if (mode == OPERATION_MODE_SEARCH)
     {
       g_clear_object (&impl->priv->model_for_search);
-      search_stop_searching (impl, FALSE);
+      search_stop_searching (impl, TRUE);
       search_clear_model (impl, TRUE);
     }
 }
@@ -6928,10 +6928,9 @@ search_stop_searching (GtkFileChooserWidget *impl,
 {
   GtkFileChooserWidgetPrivate *priv = impl->priv;
 
-  if (remove_query && priv->search_query)
+  if (remove_query && priv->search_entry)
     {
-      g_object_unref (priv->search_query);
-      priv->search_query = NULL;
+      gtk_entry_set_text (GTK_ENTRY (priv->search_entry), "");
     }
 
   if (priv->search_engine)