GNOME.org
 

[vala/staging] gtk+-3.0: port "owned delegate" annotations from the GIR version

commit 67613dd1697a00c2f059e62edf3a1ca9dbe71e79
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Aug 21 12:28:05 2014 +0200

    gtk+-3.0: port "owned delegate" annotations from the GIR version

 vapi/gtk+-3.0.vapi                       |   32 +++++++++++++++---------------
 vapi/packages/gtk+-3.0/gtk+-3.0.metadata |   28 ++++++++++++++++++++++---
 2 files changed, 40 insertions(+), 20 deletions(-)
---
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index c43e601..1c5b789 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -446,8 +446,8 @@ namespace Gtk {
                public void add_action_with_accel (Gtk.Action action, string? accelerator);
                public void add_actions (Gtk.ActionEntry[] entries, void* user_data);
                public void add_actions_full (Gtk.ActionEntry[] entries, void* user_data, GLib.DestroyNotify? 
destroy);
-               public void add_radio_actions (Gtk.RadioActionEntry[] entries, int value, [CCode (type = 
"GCallback")] Gtk.RadioActionCallback on_change);
-               public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, int value, [CCode (type = 
"GCallback")] Gtk.RadioActionCallback on_change, GLib.DestroyNotify? destroy);
+               public void add_radio_actions (Gtk.RadioActionEntry[] entries, int value, [CCode (type = 
"GCallback")] owned Gtk.RadioActionCallback on_change);
+               public void add_radio_actions_full (Gtk.RadioActionEntry[] entries, int value, [CCode (type = 
"GCallback")] owned Gtk.RadioActionCallback on_change, GLib.DestroyNotify? destroy);
                public void add_toggle_actions (Gtk.ToggleActionEntry[] entries, void* user_data);
                public void add_toggle_actions_full (Gtk.ToggleActionEntry[] entries, void* user_data, 
GLib.DestroyNotify? destroy);
                public unowned Gtk.AccelGroup get_accel_group ();
@@ -773,7 +773,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, owned 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;
@@ -1398,17 +1398,17 @@ namespace Gtk {
                public unowned Gdk.Display get_display ();
                public static unowned Gtk.Clipboard get_for_display (Gdk.Display display, Gdk.Atom selection);
                public unowned GLib.Object get_owner ();
-               public void request_contents (Gdk.Atom target, Gtk.ClipboardReceivedFunc callback);
-               public void request_image (Gtk.ClipboardImageReceivedFunc callback);
-               public void request_rich_text (Gtk.TextBuffer buffer, Gtk.ClipboardRichTextReceivedFunc 
callback);
-               public void request_targets (Gtk.ClipboardTargetsReceivedFunc callback);
-               public void request_text (Gtk.ClipboardTextReceivedFunc callback);
-               public void request_uris (Gtk.ClipboardURIReceivedFunc callback);
+               public void request_contents (Gdk.Atom target, owned Gtk.ClipboardReceivedFunc callback);
+               public void request_image (owned Gtk.ClipboardImageReceivedFunc callback);
+               public void request_rich_text (Gtk.TextBuffer buffer, owned Gtk.ClipboardRichTextReceivedFunc 
callback);
+               public void request_targets (owned Gtk.ClipboardTargetsReceivedFunc callback);
+               public void request_text (owned Gtk.ClipboardTextReceivedFunc callback);
+               public void request_uris (owned Gtk.ClipboardURIReceivedFunc callback);
                public void set_can_store (Gtk.TargetEntry[] targets);
                public void set_image (Gdk.Pixbuf pixbuf);
                public void set_text (string text, int len);
-               public bool set_with_data (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, 
Gtk.ClipboardClearFunc clear_func);
-               public bool set_with_owner (Gtk.TargetEntry[] targets, Gtk.ClipboardGetFunc get_func, 
Gtk.ClipboardClearFunc clear_func, GLib.Object owner);
+               public bool set_with_data (Gtk.TargetEntry[] targets, owned Gtk.ClipboardGetFunc get_func, 
owned Gtk.ClipboardClearFunc clear_func);
+               public bool set_with_owner (Gtk.TargetEntry[] targets, owned Gtk.ClipboardGetFunc get_func, 
owned Gtk.ClipboardClearFunc clear_func, GLib.Object owner);
                public void store ();
                public Gtk.SelectionData? wait_for_contents (Gdk.Atom target);
                public Gdk.Pixbuf? wait_for_image ();
@@ -3208,7 +3208,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, owned Gtk.MenuDetachFunc? detacher);
                public void detach ();
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Menu.from_model (GLib.MenuModel model);
@@ -3222,8 +3222,8 @@ 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_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 popup (Gtk.Widget? parent_menu_shell, Gtk.Widget? parent_menu_item, owned 
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, [CCode (delegate_target_pos = 4.33333)] owned Gtk.MenuPositionFunc? func, uint button, 
uint32 activate_time);
                public void reorder_child (Gtk.Widget child, int position);
                public void reposition ();
                public void set_accel_group (Gtk.AccelGroup accel_group);
@@ -6275,7 +6275,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, owned 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);
@@ -9511,7 +9511,7 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static unowned 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, void* data);
+       public static void print_run_page_setup_dialog_async (Gtk.Window parent, Gtk.PageSetup page_setup, 
Gtk.PrintSettings settings, owned 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 3ee3690..3542772 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -42,8 +42,8 @@ gtk_action_group_add_action_with_accel.accelerator nullable="1"
 gtk_action_group_add_actions.user_data hidden="0"
 gtk_action_group_add_actions_full.user_data hidden="0"
 gtk_action_group_add_actions_full.destroy nullable="1"
-gtk_action_group_add_radio_actions.on_change type_name="RadioActionCallback" ctype="GCallback"
-gtk_action_group_add_radio_actions_full.on_change type_name="RadioActionCallback" ctype="GCallback"
+gtk_action_group_add_radio_actions.on_change type_name="RadioActionCallback" ctype="GCallback" 
transfer_ownership="1"
+gtk_action_group_add_radio_actions_full.on_change type_name="RadioActionCallback" ctype="GCallback" 
transfer_ownership="1"
 gtk_action_group_add_radio_actions_full.destroy nullable="1"
 gtk_action_group_add_toggle_actions.user_data hidden="0"
 gtk_action_group_add_toggle_actions_full.user_data hidden="0"
@@ -121,6 +121,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 transfer_ownership="1"
 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"
@@ -227,6 +228,16 @@ GtkCList::select_row has_emitter="1"
 GtkCList::undo_selection has_emitter="1"
 GtkCList::unselect_all has_emitter="1"
 GtkCList::unselect_row has_emitter="1"
+gtk_clipboard_request_contents.callback transfer_ownership="1"
+gtk_clipboard_request_image.callback transfer_ownership="1"
+gtk_clipboard_request_rich_text.callback transfer_ownership="1"
+gtk_clipboard_request_targets.callback transfer_ownership="1"
+gtk_clipboard_request_text.callback transfer_ownership="1"
+gtk_clipboard_request_uris.callback transfer_ownership="1"
+gtk_clipboard_set_with_data.get_func transfer_ownership="1"
+gtk_clipboard_set_with_data.clear_func transfer_ownership="1"
+gtk_clipboard_set_with_owner.get_func transfer_ownership="1"
+gtk_clipboard_set_with_owner.clear_func transfer_ownership="1"
 gtk_clipboard_wait_for_contents transfer_ownership="1" nullable="1"
 gtk_clipboard_wait_for_text transfer_ownership="1" nullable="1"
 gtk_clipboard_wait_for_image transfer_ownership="1" nullable="1"
@@ -615,12 +626,18 @@ gtk_link_button_set_uri_hook.func transfer_ownership="1"
 gtk_link_button_set_uri_hook.data hidden="1"
 gtk_link_button_set_uri_hook.destroy hidden="1"
 gtk_link_button_set_uri_hook type_name="void"
-gtk_menu_attach_to_widget.detacher nullable="1"
+gtk_menu_attach_to_widget.detacher nullable="1" transfer_ownership="1"
 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" transfer_ownership="1"
 gtk_menu_popup.parent_menu_shell nullable="1"
 gtk_menu_popup.parent_menu_item nullable="1"
+gtk_menu_popup_for_device.data hidden="1"
+gtk_menu_popup_for_device.destroy hidden="1"
+gtk_menu_popup_for_device.func nullable="1" transfer_ownership="1" delegate_target_pos="4.33333" 
destroy_notify_pos="4.66667"
+gtk_menu_popup_for_device.device nullable="1"
+gtk_menu_popup_for_device.parent_menu_shell nullable="1"
+gtk_menu_popup_for_device.parent_menu_item nullable="1"
 GtkMenuPositionFunc hidden="1"
 gtk_menu_item_deselect hidden="1"
 gtk_menu_item_set_right_justified deprecated_since="3.2" replacement="Widget.set_hexpand and 
Widget.set_halign"
@@ -774,6 +791,8 @@ gtk_print_context_get_hard_margins.top is_out="1"
 gtk_print_context_get_hard_margins.bottom is_out="1"
 gtk_print_context_get_hard_margins.left is_out="1"
 gtk_print_context_get_hard_margins.right is_out="1"
+gtk_print_run_page_setup_dialog_async.data  hidden="1"
+gtk_print_run_page_setup_dialog_async.done_cb transfer_ownership="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"
 gtk_print_settings_get_page_ranges.num_ranges hidden="1"
@@ -1373,6 +1392,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 transfer_ownership="1"
 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"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]