Merge lp:~donadigo/switchboard/fix-1627225 into lp:~elementary-pantheon/switchboard/switchboard

[Adam Bieńkowski]

Pressing escape now clears search

Fix bug #1627225: "Pressing esc should clear search".

Does what it says on the tin.

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2016-11-02 00:24:55 +0000
+++ src/Switchboard.vala	2016-11-03 21:29:23 +0000
@@ -476,12 +476,19 @@
             search_box.changed.connect(() => {
                 category_view.filter_plugs(search_box.get_text ());
             });
+
             search_box.key_press_event.connect ((event) => {
-                if (event.keyval == Gdk.Key.Return) {
-                    category_view.activate_first_item ();
-                    return true;
+                switch (event.keyval) {
+                    case Gdk.Key.Return:
+                        category_view.activate_first_item ();
+                        return true;
+                    case Gdk.Key.Escape:
+                        search_box.text = "";
+                        return true;
+                    default:
+                        break;
                 }
-
+                
                 return false;
             });