From: Rico Tzschichholz Date: Tue, 27 Oct 2015 07:24:39 +0000 (+0100) Subject: gtk+-2.0, gtk+-3.0: Make Image.get_gicon.size out X-Git-Tag: 0.30.1~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9bfbba3d19a2f67d0d8f4b7622baff0ce21e3ef;p=thirdparty%2Fvala.git gtk+-2.0, gtk+-3.0: Make Image.get_gicon.size out (cherry picked from commit 60b1e4430e48a51bc5cba5c4929471fca177f8b2) --- diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 20254629a..76e6d8d82 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -2272,7 +2272,7 @@ namespace Gtk { [CCode (has_construct_function = false, type = "GtkWidget*")] public Image.from_stock (string stock_id, Gtk.IconSize size); public unowned Gdk.PixbufAnimation get_animation (); - public void get_gicon (out unowned GLib.Icon gicon, Gtk.IconSize size); + public void get_gicon (out unowned GLib.Icon gicon, out Gtk.IconSize size); public void get_icon_name (out unowned string icon_name, out Gtk.IconSize size); public void get_icon_set (out unowned Gtk.IconSet icon_set, out Gtk.IconSize size); public void get_image (out unowned Gdk.Image gdk_image, out unowned Gdk.Bitmap mask); diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index c788ae1f7..59e8d32c7 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -2865,7 +2865,7 @@ namespace Gtk { [CCode (has_construct_function = false, type = "GtkWidget*")] public Image.from_surface (Cairo.Surface surface); public unowned Gdk.PixbufAnimation get_animation (); - public void get_gicon (out unowned GLib.Icon gicon, Gtk.IconSize size); + public void get_gicon (out unowned GLib.Icon gicon, out Gtk.IconSize size); public void get_icon_name (out unowned string icon_name, out Gtk.IconSize size); public void get_icon_set (out unowned Gtk.IconSet icon_set, out Gtk.IconSize size); public unowned Gdk.Pixbuf get_pixbuf (); diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index 4c7b9ab0b..f070da1c4 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -324,6 +324,7 @@ gtk_idle_* parent="Idle" gtk_idle_add.data hidden="1" gtk_idle_add_priority.data hidden="1" GtkImage.data hidden="1" +gtk_image_get_gicon.size is_out="1" gtk_image_get_icon_name.icon_name is_out="1" gtk_image_get_icon_name.size is_out="1" gtk_image_get_icon_set.size is_out="1" diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index 2ce636a46..09580f4c9 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -593,6 +593,7 @@ gtk_icon_view_set_cursor.cell nullable="1" gtk_icon_view_set_model.model nullable="1" gtk_icon_view_unselect_all hidden="1" experimental="1" GtkImage.data hidden="1" +gtk_image_get_gicon.size is_out="1" gtk_image_get_icon_name.icon_name is_out="1" gtk_image_get_icon_name.size is_out="1" gtk_image_get_icon_set.size is_out="1"