From ef769be7116a5b9cef0f972fb54faed6b75f7dc3 Mon Sep 17 00:00:00 2001 From: Michael James Gratton Date: Mon, 23 Sep 2019 21:07:57 +1000 Subject: [PATCH] Fix FTB with recent vala requiring non-public abstract class ctors --- src/unity-aggregator-scope.vala | 2 +- src/unity-deprecated-scope.vala | 2 +- tools/preview-renderer.vala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/unity-aggregator-scope.vala b/src/unity-aggregator-scope.vala index 6664d48..5886e88 100644 --- a/src/unity-aggregator-scope.vala +++ b/src/unity-aggregator-scope.vala @@ -51,7 +51,7 @@ public abstract class AggregatorScope : DeprecatedScopeBase */ public abstract int category_index_for_scope_id (string scope_id); - public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) + protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) { Object (dbus_path: dbus_path_, id: id_, is_master: true, merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints); diff --git a/src/unity-deprecated-scope.vala b/src/unity-deprecated-scope.vala index 4fc5355..47d8cc8 100644 --- a/src/unity-deprecated-scope.vala +++ b/src/unity-deprecated-scope.vala @@ -61,7 +61,7 @@ public abstract class DeprecatedScopeBase : GLib.Object internal CategorySet _categories; internal FilterSet _filters; - public DeprecatedScopeBase (string dbus_path_, string id_) + protected DeprecatedScopeBase (string dbus_path_, string id_) { Object (dbus_path: dbus_path_, id: id_); } diff --git a/tools/preview-renderer.vala b/tools/preview-renderer.vala index ed59321..bb0aaf2 100644 --- a/tools/preview-renderer.vala +++ b/tools/preview-renderer.vala @@ -63,7 +63,7 @@ namespace Unity.Tester { */ public abstract class GridRenderer: PreviewRenderer { - public GridRenderer() + protected GridRenderer() { Object(); } -- 2.20.1