From: Rico Tzschichholz Date: Mon, 14 Sep 2015 11:56:48 +0000 (+0200) Subject: gtk+-3.0: Make callback-scope async according to introspection annoations X-Git-Tag: 0.30.0~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=795f9ba6bd7d4f6bdc396cdf516b7109d20eee78;p=thirdparty%2Fvala.git gtk+-3.0: Make callback-scope async according to introspection annoations --- diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 8e204162e..de0e546b5 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -776,7 +776,7 @@ namespace Gtk { public class Builder : GLib.Object { [CCode (has_construct_function = false)] public Builder (); - public void add_callback_symbol (string callback_name, GLib.Callback callback_symbol); + public void add_callback_symbol (string callback_name, [CCode (scope = "async")] GLib.Callback callback_symbol); public void add_callback_symbols (string first_callback_name, ...); public uint add_from_file (string filename) throws GLib.Error; public uint add_from_resource (string resource_path) throws GLib.Error; @@ -3257,7 +3257,7 @@ namespace Gtk { [CCode (has_construct_function = false, type = "GtkWidget*")] public Menu (); public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach); - public void attach_to_widget (Gtk.Widget attach_widget, Gtk.MenuDetachFunc? detacher); + public void attach_to_widget (Gtk.Widget attach_widget, [CCode (scope = "async")] Gtk.MenuDetachFunc? detacher); public void detach (); [CCode (has_construct_function = false, type = "GtkWidget*")] public Menu.from_model (GLib.MenuModel model); @@ -3271,7 +3271,7 @@ namespace Gtk { public bool get_tearoff_state (); public unowned string get_title (); public void popdown (); - public void popup (Gtk.Widget? parent_menu_shell, Gtk.Widget? parent_menu_item, Gtk.MenuPositionFunc? func, uint button, uint32 activate_time); + public void popup (Gtk.Widget? parent_menu_shell, Gtk.Widget? parent_menu_item, [CCode (scope = "async")] Gtk.MenuPositionFunc? func, uint button, uint32 activate_time); public void popup_for_device (Gdk.Device device, Gtk.Widget parent_menu_shell, Gtk.Widget parent_menu_item, Gtk.MenuPositionFunc func, void* data, GLib.DestroyNotify destroy, uint button, uint32 activate_time); public void reorder_child (Gtk.Widget child, int position); public void reposition (); @@ -6448,7 +6448,7 @@ namespace Gtk { [NoWrapper] public virtual void adjust_size_request (Gtk.Orientation orientation, ref int minimum_size, ref int natural_size); [CCode (cname = "gtk_widget_class_bind_template_callback_full")] - public class void bind_template_callback_full (string callback_name, GLib.Callback callback_symbol); + public class void bind_template_callback_full (string callback_name, [CCode (scope = "async")] GLib.Callback callback_symbol); [CCode (cname = "gtk_widget_class_bind_template_child_full")] public class void bind_template_child_full (string name, bool internal_child, ssize_t struct_offset); public bool child_focus (Gtk.DirectionType direction); @@ -9720,7 +9720,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings); [CCode (cheader_filename = "gtk/gtk.h")] - public static void print_run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings, Gtk.PageSetupDoneFunc done_cb); + public static void print_run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, Gtk.PrintSettings settings, [CCode (scope = "async")] Gtk.PageSetupDoneFunc done_cb); [CCode (cheader_filename = "gtk/gtk.h")] public static void propagate_event (Gtk.Widget widget, Gdk.Event event); [CCode (cheader_filename = "gtk/gtk.h")] diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index b1211f51e..88df6ed80 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -147,6 +147,7 @@ gtk_buildable_custom_tag_end.data is_out="1" gtk_buildable_custom_tag_start.child nullable="1" gtk_buildable_custom_tag_start.parser is_out="1" gtk_buildable_custom_tag_start.data is_out="1" +gtk_builder_add_callback_symbol.callback_symbol scope="async" gtk_builder_add_objects_from_file.object_ids no_array_length="1" array_null_terminated="1" is_array="1" gtk_builder_add_objects_from_resource.object_ids no_array_length="1" array_null_terminated="1" is_array="1" gtk_builder_add_objects_from_string.object_ids no_array_length="1" array_null_terminated="1" is_array="1" @@ -711,10 +712,10 @@ gtk_link_button_set_uri_hook.destroy hidden="1" gtk_link_button_set_uri_hook type_name="void" gtk_lock_button_new.permission nullable="1" gtk_lock_button_set_permission.permission nullable="1" -gtk_menu_attach_to_widget.detacher nullable="1" +gtk_menu_attach_to_widget.detacher nullable="1" scope="async" gtk_menu_get_for_attach_widget type_arguments="Menu" gtk_menu_popup.data hidden="1" -gtk_menu_popup.func nullable="1" +gtk_menu_popup.func nullable="1" scope="async" gtk_menu_popup.parent_menu_shell nullable="1" gtk_menu_popup.parent_menu_item nullable="1" gtk_menu_set_accel_group.accel_group nullable="1" @@ -908,6 +909,7 @@ gtk_print_operation_set_print_settings.print_settings nullable="1" GtkPrintOperation::preview.parent nullable="1" gtk_print_run_page_setup_dialog transfer_ownership="1" gtk_print_run_page_setup_dialog_async.data hidden="1" +gtk_print_run_page_setup_dialog_async.done_cb scope="async" gtk_print_settings_new_from_key_file.group_name nullable="1" gtk_print_settings_copy transfer_ownership="1" gtk_print_settings_get_page_ranges is_array="1" array_length_pos="0.1" array_length_cname="num_ranges" transfer_ownership="1" @@ -1588,6 +1590,7 @@ GtkWidget::can_activate_accel has_emitter="1" GtkWidget:can-focus accessor_method="0" GtkWidget:state-changed deprecated_since="3.0" replacement="state_flags_changed" GtkWidget:style-set deprecated_since="3.0" replacement="style_updated" +gtk_widget_class_bind_template_callback_full.callback_symbol scope="async" gtk_widget_class_path deprecated_since="3.0" replacement="get_path" gtk_widget_class_path.path_length is_out="1" gtk_widget_class_path.path is_out="1" transfer_ownership="1"