Various delegate binding fixes, patch by Evan Nemerson, fixes bug 547657

2008-12-15  Jürg Billeter  <j@bitron.ch>

	* vapi/packages/gtk+-2.0/:

	Various delegate binding fixes, patch by Evan Nemerson,
	fixes bug 547657

	* vapi/gtk+-2.0.vapi: regenerated

svn path=/trunk/; revision=2159

diff --git a/ChangeLog b/ChangeLog
index c96f31c2495ef8fbcd3225d7ffd0d714be6662a2..007439a2e25d2bd7ec6e3651c58ace98d5851032 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-15  Jürg Billeter  <j@bitron.ch>
+
+       * vapi/packages/gtk+-2.0/:
+
+       Various delegate binding fixes, patch by Evan Nemerson,
+       fixes bug 547657
+
+       * vapi/gtk+-2.0.vapi: regenerated
+
 2008-12-15  Jürg Billeter  <j@bitron.ch>
 
        * vala/valaswitchstatement.vala:

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 8e07cc6d63e0b55baa7b8f13ad599afa10a5543a..54457ef28364fa39e6213ad5f921734dbba48ba6 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -28,13 +28,13 @@ namespace Gtk {
                public void set_copyright (string copyright);
                [NoArrayLength]
                public void set_documenters (string[] documenters);
-               public static void set_email_hook (Gtk.AboutDialogActivateLinkFunc func, GLib.DestroyNotify? destroy);
+               public static void set_email_hook (Gtk.AboutDialogActivateLinkFunc# func);
                public void set_license (string license);
                public void set_logo (Gdk.Pixbuf logo);
                public void set_logo_icon_name (string icon_name);
                public void set_program_name (string name);
                public void set_translator_credits (string translator_credits);
-               public static void set_url_hook (Gtk.AboutDialogActivateLinkFunc func, GLib.DestroyNotify? destroy);
+               public static void set_url_hook (Gtk.AboutDialogActivateLinkFunc# func);
                public void set_version (string version);
                public void set_website (string website);
                public void set_website_label (string website_label);
@@ -318,7 +318,7 @@ namespace Gtk {
                public int prepend_page (Gtk.Widget page);
                public void remove_action_widget (Gtk.Widget child);
                public void set_current_page (int page_num);
-               public void set_forward_page_func (Gtk.AssistantPageFunc page_func, void* data, GLib.DestroyNotify destroy);
+               public void set_forward_page_func (Gtk.AssistantPageFunc# page_func);
                public void set_page_complete (Gtk.Widget page, bool complete);
                public void set_page_header_image (Gtk.Widget page, Gdk.Pixbuf pixbuf);
                public void set_page_side_image (Gtk.Widget page, Gdk.Pixbuf pixbuf);
@@ -528,7 +528,7 @@ namespace Gtk {
                public Calendar ();
                public void select_day (uint day);
                public bool select_month (uint month, uint year);
-               public void set_detail_func (Gtk.CalendarDetailFunc func, void* data, GLib.DestroyNotify destroy);
+               public void set_detail_func (Gtk.CalendarDetailFunc# func);
                public void set_detail_height_rows (int rows);
                public void set_detail_width_chars (int chars);
                public void set_display_options (Gtk.CalendarDisplayOptions flags);
@@ -4563,7 +4563,7 @@ namespace Gtk {
                public void set_rules_hint (bool setting);
                public void set_search_column (int column);
                public void set_search_entry (Gtk.Entry entry);
-               public void set_search_equal_func (Gtk.TreeViewSearchEqualFunc search_equal_func, void* search_user_data, Gtk.DestroyNotify search_destroy);
+               public void set_search_equal_func (Gtk.TreeViewSearchEqualFunc# search_equal_func);
                public void set_search_position_func (Gtk.TreeViewSearchPositionFunc func, void* data, GLib.DestroyNotify destroy);
                public void set_show_expanders (bool enabled);
                public void set_tooltip_cell (Gtk.Tooltip tooltip, Gtk.TreePath path, Gtk.TreeViewColumn column, Gtk.CellRenderer cell);
@@ -5497,7 +5497,7 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void sort_column_changed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (type_id = "GTK_TYPE_ACTION_ENTRY", cheader_filename = "gtk/gtk.h")]
        public struct ActionEntry {
                public weak string name;
                public weak string stock_id;
@@ -5507,7 +5507,7 @@ namespace Gtk {
                [CCode (type = "GCallback")]
                public weak Gtk.ActionCallback callback;
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (type_id = "GTK_TYPE_ALLOCATION", cheader_filename = "gtk/gtk.h")]
        public struct Allocation {
                public int x;
                public int y;
@@ -5525,7 +5525,7 @@ namespace Gtk {
                [CCode (cname = "gtk_border_new", has_construct_function = false)]
                public Border ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (type_id = "GTK_TYPE_RADIO_ACTION_ENTRY", cheader_filename = "gtk/gtk.h")]
        public struct RadioActionEntry {
                public weak string name;
                public weak string stock_id;
@@ -5534,7 +5534,7 @@ namespace Gtk {
                public weak string tooltip;
                public int value;
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (type_id = "GTK_TYPE_RECENT_DATA", cheader_filename = "gtk/gtk.h")]
        public struct RecentData {
                public string display_name;
                public string description;
@@ -5552,7 +5552,7 @@ namespace Gtk {
                public Gtk.Requisition copy ();
                public void free ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (type_id = "GTK_TYPE_TARGET_ENTRY", cheader_filename = "gtk/gtk.h")]
        public struct TargetEntry {
                public weak string target;
                public uint flags;
@@ -5665,7 +5665,7 @@ namespace Gtk {
                public bool starts_word ();
                public bool toggles_tag (Gtk.TextTag tag);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (type_id = "GTK_TYPE_TOGGLE_ACTION_ENTRY", cheader_filename = "gtk/gtk.h")]
        public struct ToggleActionEntry {
                public weak string name;
                public weak string stock_id;
@@ -6629,7 +6629,7 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate void BuilderConnectFunc (Gtk.Builder builder, GLib.Object object, string signal_name, string handler_name, GLib.Object connect_object, GLib.ConnectFlags flags);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public delegate weak string CalendarDetailFunc (Gtk.Calendar calendar, uint year, uint month, uint day);
+       public delegate string CalendarDetailFunc (Gtk.Calendar calendar, uint year, uint month, uint day);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate void Callback (Gtk.Widget widget);
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -6725,7 +6725,7 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate bool TreeViewRowSeparatorFunc (Gtk.TreeModel model, Gtk.TreeIter iter);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public static delegate bool TreeViewSearchEqualFunc (Gtk.TreeModel model, int column, string key, Gtk.TreeIter iter, void* search_data);
+       public delegate bool TreeViewSearchEqualFunc (Gtk.TreeModel model, int column, string key, Gtk.TreeIter iter);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate void TreeViewSearchPositionFunc (Gtk.TreeView tree_view, Gtk.Widget search_dialog);
        [CCode (cheader_filename = "gtk/gtk.h")]

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
index 22b8ef76cf11c3ac74f8b0bb0f760631060b95dc..489b3c574501f07ddb84415186d23196283ead93 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
@@ -49,4 +49,8 @@ namespace Gtk {
        public delegate void ActionCallback (Action action);
 
        public delegate void RadioActionCallback (Action action, Action current);
+
+       public delegate bool TreeViewSearchEqualFunc (TreeModel model, int column, string key, TreeIter iter);
+
+       public delegate string CalendarDetailFunc (Gtk.Calendar calendar, uint year, uint month, uint day);
 }

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 225b9f91b34ed7de2feba65f6bf6bae8baac6b55..1b3abebb6862d310712999a47bac8be72a5d1920 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -5,11 +5,13 @@ gtk_about_dialog_set_authors no_array_length="1"
 gtk_about_dialog_set_authors.authors is_array="1" no_array_length="1"
 gtk_about_dialog_set_documenters no_array_length="1"
 gtk_about_dialog_set_documenters.documenters is_array="1" no_array_length="1"
+gtk_about_dialog_set_email_hook.func transfer_ownership="1"
 gtk_about_dialog_set_email_hook.data hidden="1"
-gtk_about_dialog_set_email_hook.destroy nullable="1"
+gtk_about_dialog_set_email_hook.destroy hidden="1"
 gtk_about_dialog_set_email_hook type_name="void"
+gtk_about_dialog_set_url_hook.func transfer_ownership="1"
 gtk_about_dialog_set_url_hook.data hidden="1"
-gtk_about_dialog_set_url_hook.destroy nullable="1"
+gtk_about_dialog_set_url_hook.destroy hidden="1"
 gtk_about_dialog_set_url_hook type_name="void"
 gtk_accelerator_parse.accelerator_key is_out="1"
 gtk_accelerator_parse.accelerator_mods is_out="1"
@@ -36,6 +38,9 @@ GtkArg.d hidden="1"
 GtkAssistant.apply hidden="1"
 GtkAssistant.cancel hidden="1"
 GtkAssistant.close hidden="1"
+gtk_assistant_set_forward_page_func.page_func transfer_ownership="1"
+gtk_assistant_set_forward_page_func.data hidden="1"
+gtk_assistant_set_forward_page_func.destroy hidden="1"
 GtkBindingArg.d hidden="1"
 GtkBorder is_value_type="1"
 gtk_box_query_child_packing.expand is_out="1"
@@ -51,6 +56,10 @@ GtkButton::released has_emitter="1"
 gtk_calendar_get_date.year is_out="1"
 gtk_calendar_get_date.month is_out="1"
 gtk_calendar_get_date.day is_out="1"
+gtk_calendar_set_detail_func.func transfer_ownership="1"
+gtk_calendar_set_detail_func.data hidden="1"
+gtk_calendar_set_detail_func.destroy hidden="1"
+GtkCalendarDetailFunc hidden="1"
 GtkCallbackMarshal hidden="1"
 GtkCell.u hidden="1"
 GtkCellEditable::editing_done has_emitter="1"
@@ -102,6 +111,9 @@ GtkEditable::delete_text has_emitter="1"
 GtkEditable::insert_text has_emitter="1"
 GtkEntryCompletion::insert_prefix has_emitter="1"
 gtk_entry_completion_set_model.model nullable="1"
+gtk_entry_completion.func transfer_ownership="1"
+gtk_entry_completion.func_data hidden="1"
+gtk_entry_completion.func_notify hidden="1"
 gtk_false hidden="1"
 gtk_file_chooser_dialog_new.title nullable="1"
 gtk_file_chooser_dialog_new.parent nullable="1"
@@ -467,6 +479,9 @@ gtk_tree_view_get_visible_rect.visible_rect is_out="1"
 gtk_tree_view_insert_column_with_attributes ellipsis="1"
 gtk_tree_view_insert_column_with_attributes.title nullable="1"
 gtk_tree_view_set_model.model nullable="1"
+gtk_tree_view_set_search_equal_func.search_equal_func transfer_ownership="1"
+gtk_tree_view_set_search_equal_func.search_user_data hidden="1"
+gtk_tree_view_set_search_equal_func.search_destroy hidden="1"
 gtk_tree_view_scroll_to_cell.path nullable="1"
 gtk_tree_view_scroll_to_cell.column nullable="1"
 gtk_tree_view_set_cursor.focus_column nullable="1"
@@ -478,6 +493,7 @@ gtk_tree_view_column_new_with_attributes ellipsis="1"
 gtk_tree_view_column_new_with_attributes.title nullable="1"
 gtk_tree_view_column_set_attributes ellipsis="1"
 gtk_tree_view_column_set_model.model nullable="1"
+GtkTreeViewSearchEqualFunc hidden="1"
 gtk_true hidden="1"
 gtk_viewport_new.hadjustment nullable="1"
 gtk_viewport_new.vadjustment nullable="1"