Merge lp:~khurshid-alam/unity-scope-home/vala-fix into lp:unity-scope-home

Proposed by Khurshid Alam on 2019-03-18
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2019-04-12
Approved revision: 186
Merged at revision: 186
Proposed branch: lp:~khurshid-alam/unity-scope-home/vala-fix
Merge into: lp:unity-scope-home
Diff against target: 12 lines (+1/-1)
1 file modified
src/scope-registry.vala (+1/-1)
To merge this branch: bzr merge lp:~khurshid-alam/unity-scope-home/vala-fix
Reviewer Review Type Date Requested Status
Rico Tzschichholz (community) Approve on 2019-03-18
Corentin Noël (community) Approve on 2019-03-18
Sebastien Bacher 2019-03-18 Pending
Review via email: mp+364680@code.launchpad.net

Commit message

Fix build against vala >= 0.43

To post a comment you must log in.
Corentin Noël (tintou) wrote :

Indeed required, the right hand side assignment need to match the left hand side type.

review: Approve
Rico Tzschichholz (ricotz) wrote :

Looks correct

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/scope-registry.vala'
2--- src/scope-registry.vala 2013-09-20 10:35:54 +0000
3+++ src/scope-registry.vala 2019-03-18 15:16:07 +0000
4@@ -29,7 +29,7 @@
5 private SList<Unity.Protocol.ScopeRegistry.ScopeRegistryNode> registry = new SList<Unity.Protocol.ScopeRegistry.ScopeRegistryNode> ();
6
7 private HashTable<string, string> subscope_to_master = new HashTable<string, string> (str_hash, str_equal); //maps subscope id to master scope id
8- private HashTable<string, unowned Protocol.ScopeRegistry.ScopeRegistryNode?> master_to_node = new HashTable<string, Protocol.ScopeRegistry.ScopeRegistryNode?> (str_hash, str_equal); //maps master scope id to node data
9+ private HashTable<string, unowned Protocol.ScopeRegistry.ScopeRegistryNode?> master_to_node = new HashTable<string, unowned Protocol.ScopeRegistry.ScopeRegistryNode?> (str_hash, str_equal); //maps master scope id to node data
10
11 public bool scopes_ready { get; internal set; default = false; } //whether scopes tree has been processed on startup
12 public GLib.SList<Protocol.ScopeRegistry.ScopeRegistryNode?>? scopes

Subscribers

People subscribed via source and target branches

to all changes: