fix gtk_image_* and gtk_icon_size_* bindings, patch by Nicolas Joseph,

2008-04-26  Juerg Billeter  <j@bitron.ch>

	* vapi/packages/gtk+-2.0/: fix gtk_image_* and gtk_icon_size_*
	bindings, patch by Nicolas Joseph, fixes bug 529770

	* vapi/gtk+-2.0.vapi: regenerated

svn path=/trunk/; revision=1319

diff --git a/ChangeLog b/ChangeLog
index 08087f0d2d7b3c46a13575e92a4a52046199e710..2aa7e5c8ecb5ac3023572ec7c5cf71b698b0d65c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-26  Jürg Billeter  <j@bitron.ch>
+
+       * vapi/packages/gtk+-2.0/: fix gtk_image_* and gtk_icon_size_*
+       bindings, patch by Nicolas Joseph, fixes bug 529770
+
+       * vapi/gtk+-2.0.vapi: regenerated
+
 2008-04-26  Jürg Billeter  <j@bitron.ch>
 
        * gobject/valaccodegenerator.vala:

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 6896e6bb46d0d40a987a0ae4bc554e1a7d744a15..cf47ecc5ca3e63af196aa1cb737b45c6905b852a 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -3169,13 +3169,13 @@ namespace Gtk {
        public class Image : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
                public void clear ();
                public weak Gdk.PixbufAnimation get_animation ();
-               public void get_icon_name (string icon_name, Gtk.IconSize size);
-               public void get_icon_set (out weak Gtk.IconSet icon_set, Gtk.IconSize size);
+               public void get_icon_name (out weak string icon_name, out Gtk.IconSize size);
+               public void get_icon_set (out weak Gtk.IconSet icon_set, out Gtk.IconSize size);
                public void get_image (out weak Gdk.Image gdk_image, out weak Gdk.Bitmap mask);
                public weak Gdk.Pixbuf get_pixbuf ();
                public int get_pixel_size ();
                public void get_pixmap (out weak Gdk.Pixmap pixmap, out weak Gdk.Bitmap mask);
-               public void get_stock (string stock_id, Gtk.IconSize size);
+               public void get_stock (out weak string stock_id, out Gtk.IconSize size);
                public Gtk.ImageType get_storage_type ();
                public Image ();
                public Image.from_animation (Gdk.PixbufAnimation animation);
@@ -6657,9 +6657,9 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static weak string icon_size_get_name (Gtk.IconSize size);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public static bool icon_size_lookup (Gtk.IconSize size, int width, int height);
+       public static bool icon_size_lookup (Gtk.IconSize size, out int width, out int height);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public static bool icon_size_lookup_for_settings (Gtk.Settings settings, Gtk.IconSize size, int width, int height);
+       public static bool icon_size_lookup_for_settings (Gtk.Settings settings, Gtk.IconSize size, out int width, out int height);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static Gtk.IconSize icon_size_register (string name, int width, int height);
        [CCode (cheader_filename = "gtk/gtk.h")]

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index e8fbc415a8849e070cc949b5f57b64151c35727e..f9e8dc139bec21fea2a25d72416dc15ad0f6ea6f 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -97,6 +97,11 @@ gtk_icon_view_select_all hidden="1" experimental="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_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"
+gtk_image_get_stock.stock_id is_out="1"
+gtk_image_get_stock.size is_out="1"
 gtk_image_menu_item_new_from_stock.accel_group nullable="1"
 GtkIMContext::delete_surrounding has_emitter="1"
 gtk_init.argc hidden="1"
@@ -131,6 +136,10 @@ gtk_list_store_prepend.iter is_out="1"
 gtk_list_store_set_column_types.n_columns hidden="1"
 gtk_list_store_set_column_types.types array_length_pos="0.9"
 gtk_list_store_set ellipsis="1" sentinel="-1"
+gtk_icon_size_lookup.width is_out="1"
+gtk_icon_size_lookup.height is_out="1"
+gtk_icon_size_lookup_for_settings.width is_out="1"
+gtk_icon_size_lookup_for_settings.height is_out="1"
 gtk_menu_popup.data hidden="1"
 gtk_menu_popup.func nullable="1"
 gtk_menu_popup.parent_menu_shell nullable="1"