From db7f4094b3e58c3ced1067a480cac6f9037abc3c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 22 Aug 2018 12:40:41 +0200 Subject: src/background.vala: Fix FTBFS against Vala 0.42. This introduces a slight behaviour change compared to the previous version, but actually in a direction we want it to be. --- src/background.vala | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/background.vala b/src/background.vala index a70df81..69aac43 100644 --- a/src/background.vala +++ b/src/background.vala @@ -445,7 +445,14 @@ public class Background : Gtk.Fixed private string _current_background; public string? current_background { - get { return _current_background; } + get { + if (_current_background) + { + return _current_background; + } else { + return fallback_bgcolor; + } + } set { if (value == null || value == "") @@ -458,8 +465,6 @@ public class Background : Gtk.Fixed reload (); } - - default = fallback_bgcolor; } public bool draw_grid { get; set; default = true; } -- cgit v1.2.3