Merge lp:~wingpanel-devs/slingshot/slingshot-dont-handle-super-space into lp:~elementary-pantheon/slingshot/trunk

[Marcus Wichelmann]

Don't handle super+space shortcut

Ignore super+space shortcut because that's handled by wingpanel now.

[Danielle Foré (danrabbit)]

Small regression here. Slingshot should also close with esc. It no longer does.

review: Needs Fixing

[lp:~wingpanel-devs/slingshot/slingshot-dont-handle-super-space]

625. By Marcus Wichelmann on 2016-01-16

Keep on_key_press() call

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2015-12-30 11:20:11 +0000
+++ src/SlingshotView.vala	2016-01-16 01:08:20 +0000
@@ -231,7 +231,7 @@
             });
 
             event_box.key_press_event.connect (on_key_press);
-            search_entry.key_press_event.connect (search_entry_key_press);
+            search_entry.key_press_event.connect (on_key_press);
             // Showing a menu reverts the effect of the grab_device function.
             search_entry.search_changed.connect (() => {
                 if (modality != Modality.SEARCH_VIEW)
@@ -302,16 +302,6 @@
             }
         }
 
-        // Handle super+space when the user is typing in the search entry
-        private bool search_entry_key_press (Gdk.EventKey event) {
-            if ((event.keyval == Gdk.Key.space) && ((event.state & Gdk.ModifierType.SUPER_MASK) != 0)) {
-                close_indicator ();
-                return true;
-            }
-
-            return on_key_press (event);
-        }
-
         private void search_entry_activated () {
             if (modality == Modality.SEARCH_VIEW) {
                 search_view.activate_selection ();