Merge lp:~ricotz/libunity/vala-0.48 into lp:libunity

Proposed by Rico Tzschichholz on 2020-01-23
Status: Merged
Approved by: Sebastien Bacher on 2020-01-23
Approved revision: 337
Merged at revision: 337
Proposed branch: lp:~ricotz/libunity/vala-0.48
Merge into: lp:libunity
Diff against target: 38 lines (+3/-3)
3 files modified
src/unity-aggregator-scope.vala (+1/-1)
src/unity-deprecated-scope.vala (+1/-1)
tools/preview-renderer.vala (+1/-1)
To merge this branch: bzr merge lp:~ricotz/libunity/vala-0.48
Reviewer Review Type Date Requested Status
Sebastien Bacher 2020-01-23 Approve on 2020-01-23
Unity Team 2020-01-23 Pending
Review via email: mp+377992@code.launchpad.net
To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/unity-aggregator-scope.vala'
2--- src/unity-aggregator-scope.vala 2013-04-25 13:26:24 +0000
3+++ src/unity-aggregator-scope.vala 2020-01-23 12:26:39 +0000
4@@ -51,7 +51,7 @@
5 */
6 public abstract int category_index_for_scope_id (string scope_id);
7
8- public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
9+ protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
10 {
11 Object (dbus_path: dbus_path_, id: id_, is_master: true,
12 merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints);
13
14=== modified file 'src/unity-deprecated-scope.vala'
15--- src/unity-deprecated-scope.vala 2013-05-10 10:58:57 +0000
16+++ src/unity-deprecated-scope.vala 2020-01-23 12:26:39 +0000
17@@ -61,7 +61,7 @@
18 internal CategorySet _categories;
19 internal FilterSet _filters;
20
21- public DeprecatedScopeBase (string dbus_path_, string id_)
22+ protected DeprecatedScopeBase (string dbus_path_, string id_)
23 {
24 Object (dbus_path: dbus_path_, id: id_);
25 }
26
27=== modified file 'tools/preview-renderer.vala'
28--- tools/preview-renderer.vala 2015-09-11 13:22:36 +0000
29+++ tools/preview-renderer.vala 2020-01-23 12:26:39 +0000
30@@ -63,7 +63,7 @@
31 */
32 public abstract class GridRenderer: PreviewRenderer
33 {
34- public GridRenderer()
35+ protected GridRenderer()
36 {
37 Object();
38 }

Subscribers

People subscribed via source and target branches