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

Proposed by Rico Tzschichholz
Status: Merged
Approved by: Sebastien Bacher
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 Approve
Unity Team Pending
Review via email: mp+377992@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/unity-aggregator-scope.vala'
--- src/unity-aggregator-scope.vala 2013-04-25 13:26:24 +0000
+++ src/unity-aggregator-scope.vala 2020-01-23 12:26:39 +0000
@@ -51,7 +51,7 @@
51 */51 */
52 public abstract int category_index_for_scope_id (string scope_id);52 public abstract int category_index_for_scope_id (string scope_id);
5353
54 public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)54 protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
55 {55 {
56 Object (dbus_path: dbus_path_, id: id_, is_master: true,56 Object (dbus_path: dbus_path_, id: id_, is_master: true,
57 merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints);57 merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints);
5858
=== modified file 'src/unity-deprecated-scope.vala'
--- src/unity-deprecated-scope.vala 2013-05-10 10:58:57 +0000
+++ src/unity-deprecated-scope.vala 2020-01-23 12:26:39 +0000
@@ -61,7 +61,7 @@
61 internal CategorySet _categories;61 internal CategorySet _categories;
62 internal FilterSet _filters;62 internal FilterSet _filters;
63 63
64 public DeprecatedScopeBase (string dbus_path_, string id_)64 protected DeprecatedScopeBase (string dbus_path_, string id_)
65 {65 {
66 Object (dbus_path: dbus_path_, id: id_);66 Object (dbus_path: dbus_path_, id: id_);
67 }67 }
6868
=== modified file 'tools/preview-renderer.vala'
--- tools/preview-renderer.vala 2015-09-11 13:22:36 +0000
+++ tools/preview-renderer.vala 2020-01-23 12:26:39 +0000
@@ -63,7 +63,7 @@
63 */63 */
64 public abstract class GridRenderer: PreviewRenderer64 public abstract class GridRenderer: PreviewRenderer
65 {65 {
66 public GridRenderer()66 protected GridRenderer()
67 {67 {
68 Object();68 Object();
69 }69 }

Subscribers

People subscribed via source and target branches