glib-2.0, gtk+-3.0: make parameter string for goption nullable

Fixes bug 696055.

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 29cbb26507a545ff216f45fc8bccce000b623d9f..199c904611fd64f94696aac2d27d78ea5409f75f 100644 (file)
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -3183,7 +3183,7 @@ namespace GLib {
        [Compact]
        [CCode (free_function = "g_option_context_free")]
        public class OptionContext {
-               public OptionContext (string parameter_string);
+               public OptionContext (string? parameter_string = null);
                public void set_summary (string summary);
                public unowned string get_summary ();
                public void set_description (string description);

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 7f1e23426cbaeb464cc7a5305ca05d202c16e4d4..2897f565c44b6187b2f863d04c56014be4f39846 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -8751,7 +8751,7 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool init_check ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public static bool init_with_args ([CCode (array_length_pos = 0.9)] ref unowned string[] argv, string parameter_string, [CCode (array_length = false)] GLib.OptionEntry[] entries, string? translation_domain) throws GLib.Error;
+       public static bool init_with_args ([CCode (array_length_pos = 0.9)] ref unowned string[] argv, string? parameter_string, [CCode (array_length = false)] GLib.OptionEntry[] entries, string? translation_domain) throws GLib.Error;
        [CCode (cheader_filename = "gtk/gtk.h")]
        [Deprecated (since = "3.4")]
        public static uint key_snooper_install (Gtk.KeySnoopFunc snooper, void* func_data);

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index d361c33d12b0b9962605409dd6fb96fdc19cb1f3..35a0389b7f4bffb97d68fdd2b67d4cea45440a27 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -398,6 +398,7 @@ gtk_init_check_abi_check.argc hidden="1"
 gtk_init_check_abi_check.argv is_array="1" is_ref="1" array_length_pos="0.9"
 gtk_init_with_args.argc hidden="1"
 gtk_init_with_args.argv is_array="1" is_ref="1" array_length_pos="0.9"
+gtk_init_with_args.parameter_string nullable="1"
 gtk_init_with_args.entries is_array="1" no_array_length="1"
 gtk_init_with_args.translation_domain nullable="1"
 GtkItem::deselect has_emitter="1"