From: Rico Tzschichholz Date: Mon, 25 Jan 2021 20:11:55 +0000 (+0100) Subject: gtk+-3.0,gtk4: Fix some delegate return values and parameters X-Git-Tag: 0.51.1~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af09ff6183136df8211ca2d612ec916d8dd9b0bf;p=thirdparty%2Fvala.git gtk+-3.0,gtk4: Fix some delegate return values and parameters --- diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 788c5094c..39e006b88 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -2183,6 +2183,7 @@ namespace Gtk { public unowned Atk.Object get_popup_accessible (); [Version (since = "3.0")] public bool get_popup_fixed_width (); + [CCode (delegate_target = false)] [Version (since = "2.6")] public unowned Gtk.TreeViewRowSeparatorFunc get_row_separator_func (); [Version (since = "2.6")] @@ -8989,6 +8990,7 @@ namespace Gtk { public uint get_n_columns (); public bool get_path_at_pos (int x, int y, out Gtk.TreePath? path, out unowned Gtk.TreeViewColumn? column, out int cell_x, out int cell_y); public bool get_reorderable (); + [CCode (delegate_target = false)] [Version (since = "2.6")] public unowned Gtk.TreeViewRowSeparatorFunc get_row_separator_func (); [Version (since = "2.10")] @@ -8998,7 +9000,9 @@ namespace Gtk { public int get_search_column (); [Version (since = "2.10")] public unowned Gtk.Entry get_search_entry (); + [CCode (delegate_target = false)] public unowned Gtk.TreeViewSearchEqualFunc get_search_equal_func (); + [CCode (delegate_target = false)] [Version (since = "2.10")] public unowned Gtk.TreeViewSearchPositionFunc get_search_position_func (); public unowned Gtk.TreeSelection get_selection (); diff --git a/vapi/gtk4.vapi b/vapi/gtk4.vapi index ec01f7150..b34d5fd2d 100644 --- a/vapi/gtk4.vapi +++ b/vapi/gtk4.vapi @@ -5902,9 +5902,9 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h")] public static async bool content_deserialize_async (GLib.InputStream stream, string mime_type, GLib.Type type, int io_priority, GLib.Cancellable? cancellable) throws GLib.Error; [CCode (cheader_filename = "gdk/gdk.h")] - public static void content_register_deserializer (string mime_type, GLib.Type type, owned Gdk.ContentDeserializeFunc deserialize); + public static void content_register_deserializer (string mime_type, GLib.Type type, Gdk.ContentDeserializeFunc deserialize, void* data, GLib.DestroyNotify notify); [CCode (cheader_filename = "gdk/gdk.h")] - public static void content_register_serializer (GLib.Type type, string mime_type, owned Gdk.ContentSerializeFunc serialize); + public static void content_register_serializer (GLib.Type type, string mime_type, Gdk.ContentSerializeFunc serialize, void* data, GLib.DestroyNotify notify); [CCode (cheader_filename = "gdk/gdk.h")] public static async bool content_serialize_async (GLib.OutputStream stream, string mime_type, GLib.Value value, int io_priority, GLib.Cancellable? cancellable) throws GLib.Error; [CCode (cheader_filename = "gdk/gdk.h")] @@ -7503,6 +7503,7 @@ namespace Gtk { public int get_id_column (); public unowned Gtk.TreeModel? get_model (); public bool get_popup_fixed_width (); + [CCode (delegate_target = false)] public unowned Gtk.TreeViewRowSeparatorFunc? get_row_separator_func (); public void popup_for_device (Gdk.Device device); public void set_active (int index_); @@ -11689,6 +11690,7 @@ namespace Gtk { protected TreeSelection (); public int count_selected_rows (); public Gtk.SelectionMode get_mode (); + [CCode (delegate_target = false)] public unowned Gtk.TreeSelectionFunc get_select_function (); public bool get_selected (out unowned Gtk.TreeModel model, out Gtk.TreeIter iter); public GLib.List get_selected_rows (out unowned Gtk.TreeModel model); @@ -11782,10 +11784,12 @@ namespace Gtk { public uint get_n_columns (); public bool get_path_at_pos (int x, int y, out Gtk.TreePath? path, out unowned Gtk.TreeViewColumn? column, out int cell_x, out int cell_y); public bool get_reorderable (); + [CCode (delegate_target = false)] public unowned Gtk.TreeViewRowSeparatorFunc get_row_separator_func (); public bool get_rubber_banding (); public int get_search_column (); public unowned Gtk.Editable? get_search_entry (); + [CCode (delegate_target = false)] public unowned Gtk.TreeViewSearchEqualFunc get_search_equal_func (); public unowned Gtk.TreeSelection get_selection (); public bool get_show_expanders (); diff --git a/vapi/metadata/Gdk-4.0.metadata b/vapi/metadata/Gdk-4.0.metadata index 6dfbc3b74..6331583c5 100644 --- a/vapi/metadata/Gdk-4.0.metadata +++ b/vapi/metadata/Gdk-4.0.metadata @@ -42,6 +42,12 @@ Toplevel .compute_size.size nullable unowned ToplevelSize struct +// Bug #: confused girparser +content_register_deserializer + .deserialize closure=-1 destroy=-1 owned=false +content_register_serializer + .serialize closure=-1 destroy=-1 owned=false + // g-i doesn't support nullable fields and properties (bug #730479) Device .name nullable diff --git a/vapi/metadata/Gtk-3.0.metadata b/vapi/metadata/Gtk-3.0.metadata index 3f70bc3bd..9010bba01 100644 --- a/vapi/metadata/Gtk-3.0.metadata +++ b/vapi/metadata/Gtk-3.0.metadata @@ -366,6 +366,12 @@ Settings.color_hash type="GLib.HashTable" // Bug #: confused girparser Radio*.group#property no_accessor_method +ComboBox + .get_row_separator_func delegate_target=false +TreeView + .get_row_separator_func delegate_target=false + .get_search_equal_func delegate_target=false + .get_search_position_func delegate_target=false // Skipped for G-I, but usable from Vala FlowBox diff --git a/vapi/metadata/Gtk-4.0.metadata b/vapi/metadata/Gtk-4.0.metadata index 3d2b5ada4..9d5322c1f 100644 --- a/vapi/metadata/Gtk-4.0.metadata +++ b/vapi/metadata/Gtk-4.0.metadata @@ -194,6 +194,13 @@ RecentData CClosureExpression .new.callback_func closure=-1 destroy=-1 owned=false .new.user_destroy nullable +ComboBox + .get_row_separator_func delegate_target=false +TreeSelection + .get_select_function delegate_target=false +TreeView + .get_row_separator_func delegate_target=false + .get_search_equal_func delegate_target=false // Skipped for G-I, but usable from Vala FlowBox