Merge lp:~jeremywootten/slingshot/fix-1234753 into lp:~elementary-pantheon/slingshot/trunk

[Jeremy Wootten]

1) Fixes regression introduced by revision 386 by connecting to searchbar activate signal. The Enter/Return key press is now detected.
2) Move three stray signal connections into the SlingshotView::connect_signals () function for consistency
3) Suppress a large number of critical error warnings during search for applications by testing for null description and null generic name
4) Remove unnecessary EventBox and detect other key presses directly with Gtk.Grid container.

[Cody Garver (codygarver)]

Jeremy would you be willing to submit a branch that fixes the bug with as few changes as possible to I can immediately release it as a hotfix to Luna stable. Then resubmit the changes in this branch just so they'll have some time to make sure there are no bugs in it, like from removing the event box. Because slingshot focus is super delicate.

[Jeremy Wootten (jeremywootten)]

OK, no problem - I'll do that.

On 4 October 2013 02:37, Cody Garver <email address hidden> wrote:

> Jeremy would you be willing to submit a branch that fixes the bug with as
> few changes as possible to I can immediately release it as a hotfix to Luna
> stable. Then resubmit the changes in this branch just so they'll have some
> time to make sure there are no bugs in it, like from removing the event
> box. Because slingshot focus is super delicate.
> --
>
> https://code.launchpad.net/~jeremywootten/slingshot/fix-1234753/+merge/189162
> You are the owner of lp:~jeremywootten/slingshot/fix-1234753.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[lp:~jeremywootten/slingshot/fix-1234753]

387. By Jeremy Wootten on 2013-10-05

Connect to searchbar activate signal to detect Enter key

[Jeremy Wootten (jeremywootten)]

I have just overwritten this branch with a new one that only contains the
code connecting to the searchbar activate signal.

The replacement of the eventbox, the elimination of the error messages and
the re-arrangement of the code in the previous branch are essentially
cosmetic and have been removed for now.

On 4 October 2013 02:37, Cody Garver <email address hidden> wrote:

> Jeremy would you be willing to submit a branch that fixes the bug with as
> few changes as possible to I can immediately release it as a hotfix to Luna
> stable. Then resubmit the changes in this branch just so they'll have some
> time to make sure there are no bugs in it, like from removing the event
> box. Because slingshot focus is super delicate.
> --
>
> https://code.launchpad.net/~jeremywootten/slingshot/fix-1234753/+merge/189162
> You are the owner of lp:~jeremywootten/slingshot/fix-1234753.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[Cody Garver (codygarver)]

Thanks Jeremy, I'm still interested in the other code.

review: Approve

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2013-09-10 20:47:00 +0000
+++ src/SlingshotView.vala	2013-10-05 07:26:06 +0000
@@ -243,6 +243,15 @@
             searchbar.text_changed_pause.connect ((text) => this.search (text));
             searchbar.grab_focus ();
 
+            searchbar.activate.connect (() => {
+                if (modality == Modality.SEARCH_VIEW) {
+                    search_view.launch_selected ();
+                    hide ();
+                } else {
+                    if (get_focus () as AppEntry != null) // checking the selected widget is an AppEntry
+                        ((AppEntry)get_focus ()).launch_app ();
+                }
+            });
             search_view.app_launched.connect (() => hide ());
 
             // This function must be after creating the page switcher