Merge lp:~julien-spautz/slingshot/1084150 into lp:~elementary-pantheon/slingshot/trunk

Proposed by Julien Spautz
Status: Merged
Approved by: Cody Garver
Approved revision: 345
Merged at revision: 357
Proposed branch: lp:~julien-spautz/slingshot/1084150
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 54 lines (+7/-5)
2 files modified
src/Backend/AppSystem.vala (+1/-1)
src/SlingshotView.vala (+6/-4)
To merge this branch: bzr merge lp:~julien-spautz/slingshot/1084150
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+152774@code.launchpad.net

Commit message

Description of the change

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Backend/AppSystem.vala'
2--- src/Backend/AppSystem.vala 2013-02-16 11:56:18 +0000
3+++ src/Backend/AppSystem.vala 2013-03-11 20:49:19 +0000
4@@ -41,7 +41,7 @@
5 apps_menu = GMenu.Tree.lookup ("pantheon-applications.menu", TreeFlags.INCLUDE_EXCLUDED);
6 apps_menu.add_monitor ((menu) => {
7
8- debug ("Apps menu tree changed. Updating..");
9+ debug ("Apps menu tree changed. Updating…");
10 index_changed = true;
11 update_app_system ();
12 changed ();
13
14=== modified file 'src/SlingshotView.vala'
15--- src/SlingshotView.vala 2013-02-16 13:10:53 +0000
16+++ src/SlingshotView.vala 2013-03-11 20:49:19 +0000
17@@ -164,7 +164,7 @@
18 else
19 view_selector.selected = 0;
20
21- searchbar = new SearchBar (_("Search Apps..."));
22+ searchbar = new SearchBar (_("Search Apps…"));
23 searchbar.pause_delay = 200;
24 searchbar.width_request = 250;
25 searchbar.button_press_event.connect ((e) => {return e.button == 3;});
26@@ -236,7 +236,7 @@
27
28 //view_manager.draw.connect (this.draw_background);
29
30- searchbar.text_changed_pause.connect ((text) => this.search (text.down ().strip ()));
31+ searchbar.text_changed_pause.connect ((text) => this.search (text));
32 searchbar.grab_focus ();
33
34 search_view.app_launched.connect (() => hide ());
35@@ -626,7 +626,9 @@
36
37 private async void search (string text) {
38
39- if (text == "") {
40+ var stripped = text.down ().strip ();
41+
42+ if (stripped == "") {
43 set_modality ((Modality) view_selector.selected);
44 return;
45 }
46@@ -637,7 +639,7 @@
47 view_manager.move (search_view, 0, search_view_position);
48 search_view.hide_all ();
49
50- var filtered = yield app_system.search_results (text);
51+ var filtered = yield app_system.search_results (stripped);
52
53 foreach (App app in filtered) {
54 search_view.show_app (app);

Subscribers

People subscribed via source and target branches