Merge lp:~codygarver/scratch/fix-1269555 into lp:~elementary-apps/scratch/scratch

Proposed by Cody Garver
Status: Merged
Approved by: Mario Guerriero
Approved revision: 1252
Merged at revision: 1252
Proposed branch: lp:~codygarver/scratch/fix-1269555
Merge into: lp:~elementary-apps/scratch/scratch
Diff against target: 29 lines (+4/-3)
2 files modified
plugins/outline/CMakeLists.txt (+1/-0)
plugins/outline/ValaSymbolResolver.vala (+3/-3)
To merge this branch: bzr merge lp:~codygarver/scratch/fix-1269555
Reviewer Review Type Date Requested Status
Mario Guerriero (community) Approve
Review via email: mp+205078@code.launchpad.net

Commit message

Use "new Thread" instance with glib 2.32 target

To post a comment you must log in.
Revision history for this message
Mario Guerriero (mefrio-g) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/outline/CMakeLists.txt'
2--- plugins/outline/CMakeLists.txt 2014-01-24 17:15:27 +0000
3+++ plugins/outline/CMakeLists.txt 2014-02-06 05:35:20 +0000
4@@ -17,6 +17,7 @@
5 --vapidir=${CMAKE_BINARY_DIR}
6 --vapidir=${CMAKE_BINARY_DIR}/src/
7 --vapidir=${CMAKE_BINARY_DIR}/scratchcore/
8+ --target-glib=2.32
9 )
10
11 pkg_check_modules(OUTLINE_DEPS libvala-${VALA_SHORTVER})
12
13=== modified file 'plugins/outline/ValaSymbolResolver.vala'
14--- plugins/outline/ValaSymbolResolver.vala 2013-07-09 09:15:52 +0000
15+++ plugins/outline/ValaSymbolResolver.vala 2014-02-06 05:35:20 +0000
16@@ -115,11 +115,11 @@
17 {
18 cache.children.clear ();
19 init_context ();
20-
21- unowned Thread<void*> thread = Thread.create<void*> (() => {
22+
23+ Thread<void*> thread = new Thread<void*>("parse-symbols", () => {
24 parse_symbols_async ();
25 return null;
26- }, true);
27+ });
28
29 thread.join ();
30

Subscribers

People subscribed via source and target branches