vala r1319 - in trunk: . vapi vapi/packages/gtk+-2.0

[juergbi svn gnome org]

Author: juergbi
Date: Sat Apr 26 08:08:17 2008
New Revision: 1319
URL: http://svn.gnome.org/viewvc/vala?rev=1319&view=rev

Log:
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


Modified:
   trunk/ChangeLog
   trunk/vapi/gtk+-2.0.vapi
   trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata

Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi	(original)
+++ trunk/vapi/gtk+-2.0.vapi	Sat Apr 26 08:08:17 2008
@@ -3169,13 +3169,13 @@
 	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 @@
 	[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")]

Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata	(original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata	Sat Apr 26 08:08:17 2008
@@ -97,6 +97,11 @@
 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_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"