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

Proposed by Stephen M. Webb on 2015-03-09
Status: Superseded
Proposed branch: lp:~bregma/unity-scope-home/lp-1430063
Merge into: lp:unity-scope-home
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
PS Jenkins bot (community) continuous-integration Needs Fixing on 2015-03-10
Unity Team 2015-03-09 Pending
Review via email: mp+252384@code.launchpad.net

This proposal has been superseded by a proposal from 2015-03-10.

Commit message

Made sure a variable was initialized before using it as an rvalue (for valac-0.26).

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.

Unmerged revisions

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-09 23:19:06 +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;
11
12 var type_str = scope_elm_array.get_element (1).get_string ();

Subscribers

People subscribed via source and target branches

to all changes: