]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
gtk+-2.0, gtk+-3.0: Make Image.get_gicon.size out
authorRico Tzschichholz <ricotz@ubuntu.com>
Tue, 27 Oct 2015 07:24:39 +0000 (08:24 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Tue, 27 Oct 2015 18:20:16 +0000 (19:20 +0100)
(cherry picked from commit 60b1e4430e48a51bc5cba5c4929471fca177f8b2)

vapi/gtk+-2.0.vapi
vapi/gtk+-3.0.vapi
vapi/packages/gtk+-2.0/gtk+-2.0.metadata
vapi/packages/gtk+-3.0/gtk+-3.0.metadata

index 20254629a99b1aaa78a64d2373773731c5e2fe4a..76e6d8d82d21093b17abb52dee1592432bab2d24 100644 (file)
@@ -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);
index c788ae1f7d7a553b8a5f9eddf1e71f04f334e426..59e8d32c7470380a3a7745a2d4bb84e1de0f632b 100644 (file)
@@ -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 ();
index 4c7b9ab0b358ac5db6462b1164174469b4371794..f070da1c407a965a73e92c6cb6da1fc3516ddf98 100644 (file)
@@ -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"
index 2ce636a463006d3b42e9410f87adb3877f1e883e..09580f4c93721086a8228764adec3fd23039a8d2 100644 (file)
@@ -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"