From a2b5f0064d19ebbce98f5a0d4dda05b43e7f1985 Mon Sep 17 00:00:00 2001 From: Evan Nemerson Date: Fri, 13 Nov 2009 00:18:19 -0800 Subject: [PATCH] gtk+-2.0: make several Gtk.Entry.set_icon_* parameters nullable. Fixes bug 600597. --- vapi/gtk+-2.0.vapi | 12 ++++++------ vapi/packages/gtk+-2.0/gtk+-2.0.metadata | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index c8fe2c8eb..9fa8ba8e2 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -1247,13 +1247,13 @@ namespace Gtk { public void set_has_frame (bool setting); public void set_icon_activatable (Gtk.EntryIconPosition icon_pos, bool activatable); public void set_icon_drag_source (Gtk.EntryIconPosition icon_pos, Gtk.TargetList target_list, Gdk.DragAction actions); - public void set_icon_from_gicon (Gtk.EntryIconPosition icon_pos, GLib.Icon icon); - public void set_icon_from_icon_name (Gtk.EntryIconPosition icon_pos, string icon_name); - public void set_icon_from_pixbuf (Gtk.EntryIconPosition icon_pos, Gdk.Pixbuf pixbuf); - public void set_icon_from_stock (Gtk.EntryIconPosition icon_pos, string stock_id); + public void set_icon_from_gicon (Gtk.EntryIconPosition icon_pos, GLib.Icon? icon); + public void set_icon_from_icon_name (Gtk.EntryIconPosition icon_pos, string? icon_name); + public void set_icon_from_pixbuf (Gtk.EntryIconPosition icon_pos, Gdk.Pixbuf? pixbuf); + public void set_icon_from_stock (Gtk.EntryIconPosition icon_pos, string? stock_id); public void set_icon_sensitive (Gtk.EntryIconPosition icon_pos, bool sensitive); - public void set_icon_tooltip_markup (Gtk.EntryIconPosition icon_pos, string tooltip); - public void set_icon_tooltip_text (Gtk.EntryIconPosition icon_pos, string tooltip); + public void set_icon_tooltip_markup (Gtk.EntryIconPosition icon_pos, string? tooltip); + public void set_icon_tooltip_text (Gtk.EntryIconPosition icon_pos, string? tooltip); public void set_inner_border (Gtk.Border border); public void set_invisible_char (unichar ch); public void set_max_length (int max); diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index b8082d54f..baec31bb3 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -132,6 +132,12 @@ gtk_entry_completion.func_notify hidden="1" gtk_entry_completion_set_match_func.func transfer_ownership="1" gtk_entry_completion_set_match_func.func_data hidden="1" gtk_entry_completion_set_match_func.func_notify hidden="1" +gtk_entry_set_icon_from_pixbuf.pixbuf nullable="1" +gtk_entry_set_icon_from_stock.stock_id nullable="1" +gtk_entry_set_icon_from_icon_name.icon_name nullable="1" +gtk_entry_set_icon_from_gicon.icon nullable="1" +gtk_entry_set_icon_tooltip_markup.tooltip nullable="1" +gtk_entry_set_icon_tooltip_text.tooltip nullable="1" gtk_false hidden="1" gtk_file_chooser_get_current_folder transfer_ownership="1" gtk_file_chooser_get_current_folder_uri transfer_ownership="1" -- 2.47.3