gio-2.0: maintain backwards compatibility with old ActionEntry binding

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index baee21a0a617601a963a053e29394eaf81877420..2c54ad181383b2cce17ac2fd3b475e6d78513e58 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -2893,13 +2893,19 @@ namespace GLib {
                public virtual signal void changed ();
                public virtual signal void removed ();
        }
-       [CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
+       [CCode (cheader_filename = "gio/gio.h")]
        public struct ActionEntry {
                public weak string name;
-               public GLib.SimpleActionActivateCallback activate;
+               [Deprecated (replacement = "activate_callback", since = "vala-0.26")]
+               public GLib.SimpleActionActivateCallback? activate;
                public weak string parameter_type;
                public weak string state;
-               public GLib.SimpleActionChangeStateCallback change_state;
+               [Deprecated (replacement = "change_state_callback", since = "vala-0.26")]
+               public GLib.SimpleActionChangeStateCallback? change_state;
+               [CCode (cname = "activate")]
+               public GLib.SimpleActionActivateFunc activate_callback;
+               [CCode (cname = "change_state")]
+               public GLib.SimpleActionChangeStateCallback? change_state_callback;
        }
        [CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
        public struct DBusErrorEntry {
@@ -3653,10 +3659,16 @@ namespace GLib {
        public delegate GLib.Variant SettingsBindSetMappingShared (GLib.Value value, GLib.VariantType expected_type, void* user_data);
        [CCode (cheader_filename = "gio/gio.h", instance_pos = 2.9)]
        public delegate bool SettingsGetMapping (GLib.Variant value, out void* result);
+       [CCode (cheader_filename = "gio/gio.h")]
+       [Deprecated (replacement = "SimplActionActivateFunc", since = "vala-0.26")]
+       public delegate void SimpleActionActivateCallback (GLib.SimpleAction action, GLib.Variant? parameter);
        [CCode (cheader_filename = "gio/gio.h", has_target = false)]
-       public delegate void SimpleActionActivateCallback (GLib.SimpleAction action, GLib.Variant? parameter, void* user_data);
+       public delegate void SimpleActionActivateFunc (GLib.SimpleAction action, GLib.Variant? parameter, void* user_data);
+       [CCode (cheader_filename = "gio/gio.h")]
+       [Deprecated (replacement = "SimplActionChangeStateFunc", since = "vala-0.26")]
+       public delegate void SimpleActionChangeStateCallback (GLib.SimpleAction action, GLib.Variant value);
        [CCode (cheader_filename = "gio/gio.h", has_target = false)]
-       public delegate void SimpleActionChangeStateCallback (GLib.SimpleAction action, GLib.Variant value, void* user_data);
+       public delegate void SimpleActionChangeStateFunc (GLib.SimpleAction action, GLib.Variant value, void* user_data);
        [CCode (cheader_filename = "gio/gio.h", has_target = false)]
        public delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable? cancellable = null);
        [CCode (cheader_filename = "gio/gio.h", instance_pos = 2.9)]

diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala
index 830466c9691fff6a48b1cf6ef03ca81f1841525f..995f2b3b4808557958b1871433b56c12e02293e6 100644 (file)
--- a/vapi/metadata/Gio-2.0-custom.vala
+++ b/vapi/metadata/Gio-2.0-custom.vala
@@ -7,6 +7,20 @@ namespace GLib {
                public T get_proxy_sync<T> (GLib.BusType bus_type, string name, string object_path, GLib.DBusProxyFlags flags = 0, GLib.Cancellable? cancellable = null) throws GLib.IOError;
        }
 
+       public struct ActionEntry {
+               public weak string name;
+               [Deprecated (since = "vala-0.26", replacement = "activate_callback")]
+               public GLib.SimpleActionActivateCallback? activate;
+               public weak string parameter_type;
+               public weak string state;
+               [Deprecated (since = "vala-0.26", replacement = "change_state_callback")]
+               public GLib.SimpleActionChangeStateCallback? change_state;
+               [CCode (cname = "activate")]
+               public GLib.SimpleActionActivateFunc activate_callback;
+               [CCode (cname = "change_state")]
+               public GLib.SimpleActionChangeStateCallback? change_state_callback;
+       }
+
        [Compact]
        [CCode (cname = "GSource", ref_function = "g_source_ref", unref_function = "g_source_unref")]
        public class CancellableSource : GLib.Source {
@@ -198,9 +212,13 @@ namespace GLib {
        }
 
        [CCode (has_target = false)]
-       public delegate void SimpleActionActivateCallback (SimpleAction action, Variant? parameter, void* user_data);
+       public delegate void SimpleActionActivateFunc (SimpleAction action, Variant? parameter, void* user_data);
        [CCode (has_target = false)]
-       public delegate void SimpleActionChangeStateCallback (SimpleAction action, Variant value, void* user_data);
+       public delegate void SimpleActionChangeStateFunc (SimpleAction action, Variant value, void* user_data);
+       [Deprecated (since = "vala-0.26", replacement = "SimplActionActivateFunc")]
+       public delegate void SimpleActionActivateCallback (SimpleAction action, Variant? parameter);
+       [Deprecated (since = "vala-0.26", replacement = "SimplActionChangeStateFunc")]
+       public delegate void SimpleActionChangeStateCallback (SimpleAction action, Variant value);
        [CCode (cheader_filename = "gio/gio.h", instance_pos = 6.9)]
        public delegate GLib.Variant DBusInterfaceGetPropertyFunc (GLib.DBusConnection connection, string sender, string object_path, string interface_name, string property_name) throws GLib.Error;
        [CCode (cheader_filename = "gio/gio.h", instance_pos = 7.9)]

diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 6effd4cab20b5f3d83add169a7bcbf100bcf8081..5d9f54f253698221996524039dc2dac612d6da64 100644 (file)
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -58,8 +58,7 @@ Action
 PropertyAction
   .state nullable
 ActionEntry
-  .activate type="GLib.SimpleActionActivateCallback"
-  .change_state type="GLib.SimpleActionChangeStateCallback"
+  .*#field skip
 ActionGroup
   .query_action#virtual_method virtual
 Application.handle_local_options#virtual_method skip=false