unity-lens-applications

Merge lp:~mhr3/unity-lens-applications/fix-856205 into lp:unity-lens-applications/0.4

Proposed by Michal Hruby on 2011-11-16

Status:

Merged

Merged at revision:

248

Proposed branch:

Merge into:

Diff against target:

2 files modified

src/daemon.vala (+2/-2)
src/runner.vala (+2/-1)

To merge this branch:

bzr merge lp:~mhr3/unity-lens-applications/fix-856205

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Mikkel Kamstrup Erlandsen (community)		2011-11-16	Approve on 2011-11-16
Review via email: [email protected]

Revision history for this message

Mikkel Kamstrup Erlandsen (kamstrup) wrote on 2011-11-16:

review approve

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'src/daemon.vala'
2	--- src/daemon.vala 2011-10-07 10:31:54 +0000
3	+++ src/daemon.vala 2011-11-16 17:32:28 +0000
4	@@ -445,7 +445,7 @@
5	});
6
7	if (search != null)
8	- search.finished ();
9	+ Idle.add (() => { search.finished (); return false; });
10	}
11
12	private async void update_global_search (Unity.LensSearch? search)
13	@@ -511,7 +511,7 @@
14	});
15
16	if (search != null)
17	- search.finished ();
18	+ Idle.add (() => { search.finished (); return false; });
19	}
20
21	private string prepare_pkg_search_string (Unity.LensSearch? search, string type_id="all")
22
23	=== modified file 'src/runner.vala'
24	--- src/runner.vala 2011-09-08 13:14:52 +0000
25	+++ src/runner.vala 2011-11-16 17:32:28 +0000
26	@@ -326,7 +326,8 @@
27
28
29	release_scopelock ();
30	- search.finished ();
31	+
32	+ Idle.add (() => { search.finished (); return false; });
33	}
34
35	private void release_scopelock ()