Fix test schema compilation and harden settings infrastructure

Author: zquestz

data/meson.build

@@ -7,16 +7,13 @@ plank_appdata = i18n.merge_file(
   install_dir: join_paths(data_dir, 'metainfo'),
 )
 
-plank_gschema = configure_file(
-  input: 'net.launchpad.plank.gschema.xml.in',
-  output: 'net.launchpad.plank.gschema.xml',
-  configuration: customconf,
-  install: true,
+install_data(
+  'net.launchpad.plank.gschema.xml',
   install_dir: join_paths(data_dir, 'glib-2.0', 'schemas'),
 )
 
 plank_gschema_compile = gnome.compile_schemas(
-  depend_files: plank_gschema,
+  depend_files: files('net.launchpad.plank.gschema.xml'),
 )
 
 i18n.merge_file(

data/net.launchpad.plank.gschema.xml.in

@@ -27,6 +27,7 @@ namespace Docky {
     }
 
     protected override void reset_properties () {
+      base.reset_properties ();
       LargeIcons = false;
       CustomIcon = "";
     }

docklets/Applications/ApplicationsPreferences.vala

@@ -30,6 +30,7 @@ namespace Docky {
     }
 
     protected override void reset_properties () {
+      base.reset_properties ();
       BatteryDeviceName = DEFAULT_BATTERY_DEVICE_NAME;
     }
   }

docklets/Battery/BatteryPreferences.vala

@@ -40,6 +40,7 @@ namespace Docky {
     }
 
     protected override void reset_properties () {
+      base.reset_properties ();
       MaxEntries = 15;
       TrackMouseSelections = false;
       TrackImages = true;

docklets/Clippy/ClippyPreferences.vala

@@ -37,6 +37,7 @@ namespace Docky {
     }
 
     protected override void reset_properties () {
+      base.reset_properties ();
       ShowMilitary = false;
       ShowDigital = false;
       ShowDate = false;

docklets/Clock/ClockPreferences.vala

@@ -29,6 +29,7 @@ namespace Docky {
     }
 
     protected override void reset_properties () {
+      base.reset_properties ();
       EnableExpiry = false;
       ShowCount = true;
       ShowTransient = false;

docklets/Notifications/NotificationsPreferences.vala

@@ -43,6 +43,7 @@ namespace Docky {
     }
 
     protected override void reset_properties () {
+      base.reset_properties ();
       InvertColor = false;
       Style = SeparatorStyle.LINE;
       CustomIcon = "";

docklets/Separator/SeparatorPreferences.vala

@@ -263,26 +263,16 @@ namespace Docky {
       show_empty_trash_dialog();
     }
 
-    private static GLib.Settings? create_settings(string schema_id, string? path = null) {
-      var schema_source = GLib.SettingsSchemaSource.get_default();
-      var schema = schema_source.lookup(schema_id, true);
-      if (schema == null) {
-        warning("GSettingsSchema '%s' not found", schema_id);
-        return null;
-      }
-      return new GLib.Settings.full(schema, null, path);
-    }
-
     private bool confirm_trash_delete() {
       if (environment_is_session_desktop(XdgSessionDesktop.CINNAMON)) {
-        var settings = create_settings(NEMO_SCHEMA, NEMO_PATH);
+        var settings = try_create_settings(NEMO_SCHEMA, NEMO_PATH);
         if (settings != null) {
           return settings.get_boolean("confirm-trash");
         }
       }
 
       if (environment_is_session_desktop(XdgSessionDesktop.MATE)) {
-        var settings = create_settings(CAJA_SCHEMA, CAJA_PATH);
+        var settings = try_create_settings(CAJA_SCHEMA, CAJA_PATH);
         if (settings != null) {
           return settings.get_boolean("confirm-trash");
         }

docklets/Trash/TrashDockItem.vala

@@ -33,7 +33,9 @@ namespace Docky {
     }
 
     protected override void reset_properties () {
+      base.reset_properties ();
       InvertColor = false;
+      LivePreviews = true;
     }
   }
 }