From 61ffb517bc9211c7007d9274a74c6a7c23a3a112 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 10 Aug 2015 20:15:26 +0200
Subject: [PATCH] font chooser: Make Escape stop search

---
 gtk/gtkfontchooserwidget.c     | 9 ++++++++-
 gtk/ui/gtkfontchooserwidget.ui | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index a0db55c753..6f1701f80c 100644
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -301,12 +301,18 @@ gtk_font_chooser_widget_refilter_font_list (GtkFontChooserWidget *fontchooser)
 
 static void
 text_changed_cb (GtkEntry             *entry,
-                 GParamSpec           *pspec,
                  GtkFontChooserWidget *fc)
 {
   gtk_font_chooser_widget_refilter_font_list (fc);
 }
 
+static void
+stop_search_cb (GtkEntry             *entry,
+                GtkFontChooserWidget *fc)
+{
+  gtk_entry_set_text (entry, "");
+}
+
 static void
 size_change_cb (GtkAdjustment *adjustment,
                 gpointer       user_data)
@@ -580,6 +586,7 @@ gtk_font_chooser_widget_class_init (GtkFontChooserWidgetClass *klass)
   gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserWidget, size_slider);
 
   gtk_widget_class_bind_template_callback (widget_class, text_changed_cb);
+  gtk_widget_class_bind_template_callback (widget_class, stop_search_cb);
   gtk_widget_class_bind_template_callback (widget_class, cursor_changed_cb);
   gtk_widget_class_bind_template_callback (widget_class, row_activated_cb);
   gtk_widget_class_bind_template_callback (widget_class, gtk_font_chooser_widget_set_cell_size);
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 98b6b0edb1..be0446180b 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -48,7 +48,8 @@
             <property name="primary_icon_sensitive">False</property>
             <property name="secondary_icon_sensitive">False</property>
             <property name="placeholder_text" translatable="yes">Search font name</property>
-            <signal name="notify::text" handler="text_changed_cb" swapped="no"/>
+            <signal name="search-changed" handler="text_changed_cb" swapped="no"/>
+            <signal name="stop-search" handler="stop_search_cb" swapped="no"/>
           </object>
           <packing>
             <property name="left_attach">0</property>