Merge lp:~bregma/unity-scope-home/lp-1430063 into lp:unity-scope-home

Proposed by Stephen M. Webb on 2015-03-10
Status: Merged
Approved by: Paweł Stołowski on 2015-03-10
Approved revision: 179
Merged at revision: 180
Proposed branch: lp:~bregma/unity-scope-home/lp-1430063
Merge into: lp:unity-scope-home
Prerequisite: lp:~bregma/unity-scope-home/lp-1430248
Diff against target: 12 lines (+1/-1)
1 file modified
src/smart-scopes-parse.vala (+1/-1)
To merge this branch: bzr merge lp:~bregma/unity-scope-home/lp-1430063
Reviewer Review Type Date Requested Status
Paweł Stołowski 2015-03-10 Approve on 2015-03-10
PS Jenkins bot continuous-integration 2015-03-10 Pending
Review via email:

This proposal supersedes a proposal from 2015-03-09.

Commit message

initialized an uninitialized variable used in an "if" statement

Description of the change

Valac-0.26 (the default on Ubuntu "Vivid Vervet" dev release) is less tolerant of possibly uninitialized variables used as rvalues and flags an error. Initializing the variable eliminates the error.

To post a comment you must log in.
Paweł Stołowski (stolowski) wrote :

I'm not sure what Jenkins is complaining about, but this change definitely looks good! Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/smart-scopes-parse.vala'
2--- src/smart-scopes-parse.vala 2013-05-03 18:51:00 +0000
3+++ src/smart-scopes-parse.vala 2015-03-10 13:52:30 +0000
4@@ -141,7 +141,7 @@
5 if (scope_elm_array.get_length () == 2)
6 {
7 var id = scope_elm_array.get_element (0).get_string ();
8- ScopeType tp;
9+ ScopeType tp = ScopeType.ClientScope;
10 bool invalid_type = false;
12 var type_str = scope_elm_array.get_element (1).get_string ();


People subscribed via source and target branches

to all changes: