gio-2.0 Update SettingsBackend related bindings

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 751170c36ae7dbb680317624ff8fb0d816deb3d2..c9b71285ec2b770625bb323c49505b95116c0e57 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -1369,6 +1369,8 @@ namespace GLib {
                public const string PROXY;
                [CCode (cheader_filename = "gio/gio.h", cname = "G_PROXY_RESOLVER_EXTENSION_POINT_NAME")]
                public const string PROXY_RESOLVER;
+               [CCode (cheader_filename = "gio/gio.h", cname = "G_SETTINGS_BACKEND_EXTENSION_POINT_NAME")]
+               public const string SETTINGS_BACKEND;
                [CCode (cheader_filename = "gio/gio.h", cname = "G_TLS_BACKEND_EXTENSION_POINT_NAME")]
                public const string TLS_BACKEND;
                [CCode (cheader_filename = "gio/gio.h", cname = "G_VFS_EXTENSION_POINT_NAME")]
@@ -2026,7 +2028,7 @@ namespace GLib {
                public GLib.Resource @ref ();
                public void unref ();
        }
-       [CCode (cheader_filename = "gio/gio.h")]
+       [CCode (cheader_filename = "gio/gio.h", type_id = "g_settings_get_type ()")]
        public class Settings : GLib.Object {
                [CCode (has_construct_function = false)]
                [Version (since = "2.26")]
@@ -2147,15 +2149,57 @@ namespace GLib {
                public string schema_id { owned get; construct; }
                [NoAccessorMethod]
                public GLib.SettingsSchema settings_schema { owned get; construct; }
-               public virtual signal bool change_event (GLib.Quark[]? keys);
+               public virtual signal bool change_event ([CCode (array_length_cname = "n_keys", array_length_pos = 1.1)] GLib.Quark[]? keys);
                public virtual signal void changed (string key);
                public virtual signal bool writable_change_event (uint key);
                public virtual signal void writable_changed (string key);
        }
-       [CCode (cheader_filename = "gio/gio.h")]
-       public class SettingsBackend : GLib.Object {
+       [CCode (cheader_filename = "gio/gio.h", type_id = "g_settings_backend_get_type ()")]
+       public abstract class SettingsBackend : GLib.Object {
                [CCode (has_construct_function = false)]
                protected SettingsBackend ();
+               [Version (since = "2.26")]
+               public void changed (string key, void* origin_tag);
+               [Version (since = "2.26")]
+               public void changed_tree (GLib.Tree tree, void* origin_tag);
+               [Version (since = "2.26")]
+               public static void flatten_tree (GLib.Tree tree, out string path, [CCode (array_length = false, array_null_terminated = true)] out (unowned string)[] keys, [CCode (array_length = false, array_null_terminated = true)] out (unowned GLib.Variant)[] values);
+               [Version (since = "2.28")]
+               public static GLib.SettingsBackend get_default ();
+               [NoWrapper]
+               public virtual bool get_writable (string key);
+               [CCode (cheader_filename = "gio/gio.h", cname = "g_keyfile_settings_backend_new")]
+               public static GLib.SettingsBackend keyfile_settings_backend_new (string filename, string root_path, string? root_group);
+               [Version (since = "2.26")]
+               public void keys_changed (string path, [CCode (array_length = false, array_null_terminated = true)] string[] items, void* origin_tag);
+               [CCode (cheader_filename = "gio/gio.h", cname = "g_memory_settings_backend_new")]
+               [Version (since = "2.28")]
+               public static GLib.SettingsBackend memory_settings_backend_new ();
+               [CCode (cheader_filename = "gio/gio.h", cname = "g_null_settings_backend_new")]
+               [Version (since = "2.28")]
+               public static GLib.SettingsBackend null_settings_backend_new ();
+               [Version (since = "2.26")]
+               public void path_changed (string path, void* origin_tag);
+               [Version (since = "2.26")]
+               public void path_writable_changed (string path);
+               [NoWrapper]
+               public virtual GLib.Variant read (string key, GLib.VariantType expected_type, bool default_value);
+               [NoWrapper]
+               public virtual GLib.Variant read_user_value (string key, GLib.VariantType expected_type);
+               [NoWrapper]
+               public virtual void reset (string key, void* origin_tag);
+               [NoWrapper]
+               public virtual void subscribe (string name);
+               [NoWrapper]
+               public virtual void sync ();
+               [NoWrapper]
+               public virtual void unsubscribe (string name);
+               [Version (since = "2.26")]
+               public void writable_changed (string key);
+               [NoWrapper]
+               public virtual bool write (string key, GLib.Variant value, void* origin_tag);
+               [NoWrapper]
+               public virtual bool write_tree (GLib.Tree tree, void* origin_tag);
        }
        [CCode (cheader_filename = "gio/gio.h", ref_function = "g_settings_schema_ref", type_id = "g_settings_schema_get_type ()", unref_function = "g_settings_schema_unref")]
        [Compact]

diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala
index 75bacc2fabdfa2e30cc02c547e495ce90bff7c92..f312ea688e3a37da2a45ed31f75699921d00e0a3 100644 (file)
--- a/vapi/metadata/Gio-2.0-custom.vala
+++ b/vapi/metadata/Gio-2.0-custom.vala
@@ -82,16 +82,11 @@ namespace GLib {
                public void set_callback ([CCode (type = "GSourceFunc")] owned PollableSourceFunc func);
        }
 
+       [CCode (cheader_filename = "gio/gio.h", type_id = "g_settings_get_type ()")]
        public class Settings : GLib.Object {
-               [NoAccessorMethod]
-               public GLib.SettingsBackend backend { owned get; construct; }
-               public virtual signal bool change_event (GLib.Quark[]? keys);
                public void bind_with_mapping (string key, GLib.Object object, string property, GLib.SettingsBindFlags flags, GLib.SettingsBindGetMappingShared get_mapping, GLib.SettingsBindSetMappingShared set_mapping, void* user_data, GLib.DestroyNotify? notify);
        }
 
-       public class SettingsBackend : GLib.Object {
-       }
-
        public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult {
                [CCode (has_construct_function = false)]
                public SimpleAsyncResult (GLib.Object? source_object, void* source_tag);

diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 595dc55f96e7e989bad7c20eefca066307ef22da..e6ebf79466aebab6a8fa31a1c83b83c3fc86b7cf 100644 (file)
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -50,6 +50,8 @@ dbus_* parent="GLib.DBus" name="dbus_(.*)"
 dbus_error_* parent="GLib.DBusError" name="dbus_error_(.*)"
 dbus_address_get_for_bus_sync parent="GLib.BusType" name="get_address_sync"
 
+*_settings_backend_new parent="GLib.SettingsBackend"
+
 Action
   .parameter_type nullable
   .state nullable
@@ -186,7 +188,6 @@ Resolver
   .lookup_service#method virtual
   .lookup_service_async#virtual_method vfunc_name="lookup_service_async" finish_vfunc_name="lookup_service_finish"
 Settings
-  .change_event skip
   .get skip=false sentinel=""
   .set skip=false sentinel=""
 SettingsSchemaSource