From: Evan Nemerson <evan@coeus-group.com>
Date: Mon, 18 Mar 2013 19:37:20 +0000 (-0700)
Subject: glib-2.0, gtk+-3.0: make parameter string for goption nullable
X-Git-Tag: 0.20.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=120b7a5b63820d7961c0ffc806cdb0f28df4f6f5;p=thirdparty%2Fvala.git

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 29cbb2650..199c90461 100644
--- 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 7f1e23426..2897f565c 100644
--- 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 d361c33d1..35a0389b7 100644
--- 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"