gio-2.0.vapi: some action related updates

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 2978484412be2b4d6f2186459bc30ff3455ba517..9c7dc0d347074a52d6d0ee444c772622918a172e 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -47,17 +47,6 @@ namespace GLib {
                public static bool is_unknown (string type);
        }
        [CCode (cheader_filename = "gio/gio.h")]
-       [Compact]
-       public class ActionEntry {
-               public weak GLib.Callback activate;
-               public weak GLib.Callback change_state;
-               public weak string name;
-               [CCode (array_length = false)]
-               public weak size_t[] padding;
-               public weak string parameter_type;
-               public weak string state;
-       }
-       [CCode (cheader_filename = "gio/gio.h")]
        public class AppLaunchContext : GLib.Object {
                [CCode (has_construct_function = false)]
                public AppLaunchContext ();
@@ -1461,13 +1450,13 @@ namespace GLib {
                [CCode (has_construct_function = false)]
                public SimpleAction.stateful (string name, GLib.VariantType parameter_type, GLib.Variant state);
                [NoAccessorMethod]
-               public bool enabled { get; construct; }
+               public bool enabled { get; set; }
                [NoAccessorMethod]
                public string name { owned get; construct; }
                [NoAccessorMethod]
                public GLib.VariantType parameter_type { owned get; construct; }
                [NoAccessorMethod]
-               public GLib.Variant state { owned get; construct; }
+               public GLib.Variant state { owned get; set; }
                [NoAccessorMethod]
                public GLib.VariantType state_type { owned get; }
                public virtual signal void activate (GLib.Variant p0);
@@ -1931,10 +1920,10 @@ namespace GLib {
                public abstract unowned GLib.Variant get_state ();
                public abstract unowned GLib.Variant get_state_hint ();
                public abstract unowned GLib.VariantType get_state_type ();
-               public bool enabled { get; construct; }
-               public string name { get; construct; }
-               public GLib.VariantType parameter_type { get; construct; }
-               public GLib.Variant state { get; construct; }
+               public bool enabled { get; }
+               public string name { get; }
+               public GLib.VariantType parameter_type { get; }
+               public GLib.Variant state { get; }
                public GLib.VariantType state_type { get; }
        }
        [CCode (cheader_filename = "gio/gio.h", type_cname = "GActionGroupInterface")]
@@ -1962,8 +1951,8 @@ namespace GLib {
        [CCode (cheader_filename = "gio/gio.h")]
        public interface ActionMap : GLib.ActionGroup, GLib.Object {
                public abstract void add_action (GLib.Action action);
-               public void add_action_entries (GLib.ActionEntry[] entries);
-               public abstract GLib.Action lookup_action (string action_name);
+               public void add_action_entries (GLib.ActionEntry[] entries, void* user_data);
+               public abstract unowned GLib.Action lookup_action (string action_name);
                public abstract void remove_action (string action_name);
        }
        [CCode (cheader_filename = "gio/gio.h")]
@@ -2333,6 +2322,16 @@ namespace GLib {
                public signal void changed ();
                public signal void removed ();
        }
+       [CCode (cheader_filename = "gio/gio.h")]
+       public struct ActionEntry {
+               public weak string name;
+               public GLib.SimpleActionActivateCallback activate;
+               public weak string parameter_type;
+               public weak string state;
+               public GLib.SimpleActionChangeStateCallback change_state;
+               [CCode (array_length = false)]
+               public weak size_t[] padding;
+       }
        [CCode (cheader_filename = "gio/gio.h", cprefix = "G_APP_INFO_CREATE_")]
        [Flags]
        public enum AppInfoCreateFlags {
@@ -2922,6 +2921,10 @@ namespace GLib {
        public delegate GLib.Variant SettingsBindSetMapping (GLib.Value value, GLib.VariantType expected_type);
        [CCode (cheader_filename = "gio/gio.h")]
        public delegate bool SettingsGetMapping (GLib.Variant value, void* result);
+       [CCode (cheader_filename = "gio/gio.h")]
+       public delegate void SimpleActionActivateCallback (GLib.SimpleAction action, GLib.Variant? parameter);
+       [CCode (cheader_filename = "gio/gio.h")]
+       public delegate void SimpleActionChangeStateCallback (GLib.SimpleAction action, GLib.Variant value);
        [CCode (cheader_filename = "gio/gio.h", has_target = false)]
        public delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable? cancellable);
        [CCode (cheader_filename = "gio/gio.h")]

diff --git a/vapi/packages/gio-2.0/gio-2.0-custom.vala b/vapi/packages/gio-2.0/gio-2.0-custom.vala
index d35d95fce93a8156dc518acde16ca842ae958ffa..1d7a4b5f23e43e56fff3fe13abd1e5cf1e15131d 100644 (file)
--- a/vapi/packages/gio-2.0/gio-2.0-custom.vala
+++ b/vapi/packages/gio-2.0/gio-2.0-custom.vala
@@ -117,4 +117,7 @@ namespace GLib {
                public int[] steal_fds ();
                public int append (int fd) throws GLib.IOError;
        }
+
+       public delegate void SimpleActionActivateCallback (SimpleAction action, Variant? parameter);
+       public delegate void SimpleActionChangeStateCallback (SimpleAction action, Variant value);
 }

diff --git a/vapi/packages/gio-2.0/gio-2.0.gi b/vapi/packages/gio-2.0/gio-2.0.gi
index c1701b862d7983a500b15cdd6dbb961f2310d538..2b864ef719fc8b2fb477d9105e61637fd7637c7a 100644 (file)
--- a/vapi/packages/gio-2.0/gio-2.0.gi
+++ b/vapi/packages/gio-2.0/gio-2.0.gi
@@ -7858,10 +7858,10 @@
                                        <parameter name="value" type="GVariant*"/>
                                </parameters>
                        </method>
-                       <property name="enabled" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="enabled" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
                        <property name="parameter-type" type="GVariantType*" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="state" type="GVariant" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="state" type="GVariant" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="state-type" type="GVariantType*" readable="1" writable="0" construct="0" construct-only="0"/>
                        <signal name="activate" when="LAST">
                                <return-type type="void"/>
@@ -10165,10 +10165,10 @@
                                        <parameter name="action" type="GAction*"/>
                                </parameters>
                        </method>
-                       <property name="enabled" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="parameter-type" type="GVariantType*" readable="1" writable="1" construct="0" construct-only="1"/>
-                       <property name="state" type="GVariant" readable="1" writable="1" construct="0" construct-only="1"/>
+                       <property name="enabled" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="name" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="parameter-type" type="GVariantType*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="state" type="GVariant" readable="1" writable="0" construct="0" construct-only="0"/>
                        <property name="state-type" type="GVariantType*" readable="1" writable="0" construct="0" construct-only="0"/>
                        <vfunc name="activate">
                                <return-type type="void"/>

diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata
index e7581ae3e01793b312600dc5d8e80d68547d8432..0e232f7aa4190c41330e23a5388433f774759dc2 100644 (file)
--- a/vapi/packages/gio-2.0/gio-2.0.metadata
+++ b/vapi/packages/gio-2.0/gio-2.0.metadata
@@ -379,7 +379,11 @@ g_action_group_get_action_state_hint nullable="1" transfer_ownership="1"
 g_action_group_get_action_state_type nullable="1"
 g_action_group_list_actions is_array="1" transfer_ownership="1" no_array_length="1" array_null_terminated="1"
 
-g_action_map_lookup_action transfer_ownership="1"
+GActionEntry is_value_type="1"
+GActionEntry.activate type_name="SimpleActionActivateCallback"
+GActionEntry.change_state type_name="SimpleActionChangeStateCallback"
+g_action_map_add_action_entries.user_data hidden="0"
+
 GMenuModel::items_changed has_emitter="1"
 g_menu_model_markup_parser_end transfer_ownership="1"
 g_menu_model_markup_parser_end_menu transfer_ownership="1"