gtk+-2.0, gtk+-3.0: Fix a few Clipboard related bindings

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 72dbf83afd7441cb8f14f6fd78ff82378b58fe2e..bfcac5506bdb49ec0a4164670e0e9763782e6569 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -4350,7 +4350,7 @@ namespace Gtk {
                public void get_bounds (out Gtk.TextIter start, out Gtk.TextIter end);
                public int get_char_count ();
                public unowned Gtk.TargetList get_copy_target_list ();
-               public Gdk.Atom get_deserialize_formats (int n_formats);
+               public Gdk.Atom[] get_deserialize_formats ();
                public void get_end_iter (out Gtk.TextIter iter);
                public bool get_has_selection ();
                public unowned Gtk.TextMark get_insert ();
@@ -7423,13 +7423,13 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate void ClipboardReceivedFunc (Gtk.Clipboard clipboard, Gtk.SelectionData selection_data);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate void ClipboardRichTextReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom format, uchar text, size_t length);
+       public delegate void ClipboardRichTextReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom format, [CCode (array_length_type = "gsize")] uint8[] text);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate void ClipboardTargetsReceivedFunc (Gtk.Clipboard clipboard, out Gdk.Atom atoms, int n_atoms);
+       public delegate void ClipboardTargetsReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom[] atoms);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate void ClipboardTextReceivedFunc (Gtk.Clipboard clipboard, string text);
+       public delegate void ClipboardTextReceivedFunc (Gtk.Clipboard clipboard, string? text);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate void ClipboardURIReceivedFunc (Gtk.Clipboard clipboard, string uris);
+       public delegate void ClipboardURIReceivedFunc (Gtk.Clipboard clipboard, [CCode (array_length = false, array_null_terminated = true)] string[] uris);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
        public delegate void ColorSelectionChangePaletteFunc (Gdk.Color colors, int n_colors);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
@@ -7469,7 +7469,7 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate int RecentSortFunc (Gtk.RecentInfo a, Gtk.RecentInfo b);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, uchar data, size_t length, bool create_tags, GLib.Error error);
+       public delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, [CCode (array_length_type = "gsize")] uint8[] data, bool create_tags, GLib.Error error);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate uchar TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter start, Gtk.TextIter end, size_t length);
        [CCode (cheader_filename = "gtk/gtk.h")]

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 3a29a00db626d00579c441672bcd517ad7391950..eb7c66d9f49b6009a1b6c0bd1fd07c13cd3bf8b5 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -4215,7 +4215,7 @@ namespace Gtk {
                public void get_bounds (out Gtk.TextIter start, out Gtk.TextIter end);
                public int get_char_count ();
                public unowned Gtk.TargetList get_copy_target_list ();
-               public Gdk.Atom get_deserialize_formats (int n_formats);
+               public Gdk.Atom[] get_deserialize_formats ();
                public void get_end_iter (out Gtk.TextIter iter);
                public bool get_has_selection ();
                public unowned Gtk.TextMark get_insert ();
@@ -7127,13 +7127,13 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate void ClipboardReceivedFunc (Gtk.Clipboard clipboard, Gtk.SelectionData selection_data);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate void ClipboardRichTextReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom format, uchar text, size_t length);
+       public delegate void ClipboardRichTextReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom format, [CCode (array_length_type = "gsize")] uint8[] text);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate void ClipboardTargetsReceivedFunc (Gtk.Clipboard clipboard, out Gdk.Atom atoms, int n_atoms);
+       public delegate void ClipboardTargetsReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom[] atoms);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate void ClipboardTextReceivedFunc (Gtk.Clipboard clipboard, string text);
+       public delegate void ClipboardTextReceivedFunc (Gtk.Clipboard clipboard, string? text);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate void ClipboardURIReceivedFunc (Gtk.Clipboard clipboard, string uris);
+       public delegate void ClipboardURIReceivedFunc (Gtk.Clipboard clipboard, [CCode (array_length = false, array_null_terminated = true)] string[] uris);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
        public delegate void ColorSelectionChangePaletteFunc (Gdk.Color colors, int n_colors);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
@@ -7169,7 +7169,7 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
        public delegate bool StylePropertyParser (string str, GLib.Value value, GLib.Error error);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, uchar data, size_t length, bool create_tags, GLib.Error error);
+       public delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter iter, [CCode (array_length_type = "gsize")] uint8[] data, bool create_tags, GLib.Error error);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate uchar TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, Gtk.TextIter start, Gtk.TextIter end, size_t length);
        [CCode (cheader_filename = "gtk/gtk.h")]

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index ad076ce43132e43ef8f228e1e47dc8565a61ebbc..c1a1154db2e2e184dcbe589142cd7f95836235c2 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -125,6 +125,12 @@ GtkCList::select_row has_emitter="1"
 GtkCList::undo_selection has_emitter="1"
 GtkCList::unselect_all has_emitter="1"
 GtkCList::unselect_row has_emitter="1"
+GtkClipboardTextReceivedFunc.text nullable="1"
+GtkClipboardTargetsReceivedFunc.atoms is_array="1"
+GtkClipboardTargetsReceivedFunc.n_atoms hidden="1"
+GtkClipboardRichTextReceivedFunc.text type_name="uint8" is_array="1" array_length_type="gsize"
+GtkClipboardRichTextReceivedFunc.length hidden="1"
+GtkClipboardURIReceivedFunc.uris is_array="1" no_array_length"1" array_null_terminated="1"
 gtk_color_button_get_color.color is_out="1"
 gtk_color_selection_get_current_color.color is_out="1"
 gtk_color_selection_get_previous_color.color is_out="1"
@@ -540,6 +546,8 @@ gtk_target_list_add_table.targets is_array="1"
 gtk_target_list_new.targets is_array="1"
 gtk_target_list_new.ntargets hidden="1"
 gtk_text_attributes_copy transfer_ownership="1"
+gtk_text_buffer_get_deserialize_formats is_array="1" transfer_ownership="1"
+gtk_text_buffer_get_deserialize_formats.n_formats hidden="1"
 gtk_text_buffer_set_text.len default_value="-1"
 gtk_text_child_anchor_get_widgets transfer_ownership="1" type_arguments="unowned Widget"
 GtkTextBuffer::apply_tag has_emitter="1"
@@ -569,6 +577,8 @@ gtk_text_buffer_register_serialize_format.function transfer_ownership="1"
 gtk_text_buffer_register_serialize_format.user_data_destroy hidden="1"
 gtk_text_buffer_new.table nullable="1"
 gtk_text_buffer_get_text transfer_ownership="1"
+GtkTextBufferDeserializeFunc.data type_name="uint8" is_array="1" array_length_type="gsize"
+GtkTextBufferDeserializeFunc.length hidden="1"
 GtkTextBufferDeserializeFunc.user_data hidden="1"
 GtkTextBufferDeserializeFunc has_target="1"
 GtkTextIter is_value_type="1"

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 034b2f5aeb7f7a18c4a7b20985278cf16be4c5b8..f2e62d7bd9cfe44e13453f3e13ed348834a78f36 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -139,6 +139,12 @@ GtkCList::select_row has_emitter="1"
 GtkCList::undo_selection has_emitter="1"
 GtkCList::unselect_all has_emitter="1"
 GtkCList::unselect_row has_emitter="1"
+GtkClipboardTextReceivedFunc.text nullable="1"
+GtkClipboardTargetsReceivedFunc.atoms is_array="1"
+GtkClipboardTargetsReceivedFunc.n_atoms hidden="1"
+GtkClipboardRichTextReceivedFunc.text type_name="uint8" is_array="1" array_length_type="gsize"
+GtkClipboardRichTextReceivedFunc.length hidden="1"
+GtkClipboardURIReceivedFunc.uris is_array="1" no_array_length"1" array_null_terminated="1"
 gtk_color_button_get_color.color is_out="1"
 gtk_color_selection_get_current_color.color is_out="1"
 gtk_color_selection_get_previous_color.color is_out="1"
@@ -552,6 +558,8 @@ gtk_target_list_add_table.targets is_array="1"
 gtk_target_list_new.targets is_array="1"
 gtk_target_list_new.ntargets hidden="1"
 gtk_text_attributes_copy transfer_ownership="1"
+gtk_text_buffer_get_deserialize_formats is_array="1" transfer_ownership="1"
+gtk_text_buffer_get_deserialize_formats.n_formats hidden="1"
 gtk_text_buffer_set_text.len default_value="-1"
 gtk_text_child_anchor_get_widgets transfer_ownership="1" type_arguments="unowned Widget"
 GtkTextBuffer::apply_tag has_emitter="1"
@@ -581,6 +589,8 @@ gtk_text_buffer_register_serialize_format.function transfer_ownership="1"
 gtk_text_buffer_register_serialize_format.user_data_destroy hidden="1"
 gtk_text_buffer_new.table nullable="1"
 gtk_text_buffer_get_text transfer_ownership="1"
+GtkTextBufferDeserializeFunc.data type_name="uint8" is_array="1" array_length_type="gsize"
+GtkTextBufferDeserializeFunc.length hidden="1"
 GtkTextBufferDeserializeFunc.user_data hidden="1"
 GtkTextBufferDeserializeFunc has_target="1"
 GtkTextIter is_value_type="1"