From: Evan Nemerson <evan@coeus-group.com>
Date: Sat, 17 Jul 2010 06:39:01 +0000 (-0700)
Subject: gtk+-2.0, gtk+-3.0: Make Gtk.Scale.add_mark's markup argument nullable
X-Git-Tag: 0.9.4~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23bfe3323f5e34ba5d4e7c9d1d600913908b1d9c;p=thirdparty%2Fvala.git

gtk+-2.0, gtk+-3.0: Make Gtk.Scale.add_mark's markup argument nullable

Fixes bug 624442.
---

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 0cfefc0a3..e0621c081 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -3320,7 +3320,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		public void add_mark (double value, Gtk.PositionType position, string markup);
+		public void add_mark (double value, Gtk.PositionType position, string? markup);
 		public void clear_marks ();
 		public int get_digits ();
 		public bool get_draw_value ();
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 1c3388cdc..0776037a2 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -2983,7 +2983,7 @@ namespace Gtk {
 	public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Scale (Gtk.Orientation orientation, Gtk.Adjustment adjustment);
-		public void add_mark (double value, Gtk.PositionType position, string markup);
+		public void add_mark (double value, Gtk.PositionType position, string? markup);
 		public void clear_marks ();
 		public int get_digits ();
 		public bool get_draw_value ();
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index c1a37f4c0..c16739a2a 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -447,6 +447,7 @@ gtk_rc_get_style_by_paths.widget_path nullable="1"
 gtk_rc_get_style_by_paths.class_path nullable="1"
 gtk_rc_style_copy transfer_ownership="1"
 gtk_rc_style_create_style transfer_ownership="1"
+gtk_scale_add_mark.markup nullable="1"
 gtk_scale_button_new.icons is_array="1" no_array_length="1"
 gtk_scale_button_set_icons.icons is_array="1" no_array_length="1"
 gtk_scale_draw_value hidden="1"
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 6c34f0bb1..1b8d4c450 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -450,6 +450,7 @@ gtk_rc_get_style_by_paths.widget_path nullable="1"
 gtk_rc_get_style_by_paths.class_path nullable="1"
 gtk_rc_style_copy transfer_ownership="1"
 gtk_rc_style_create_style transfer_ownership="1"
+gtk_scale_add_mark.markup nullable="1"
 gtk_scale_button_new.icons is_array="1" no_array_length="1"
 gtk_scale_button_set_icons.icons is_array="1" no_array_length="1"
 gtk_scale_draw_value hidden="1"