From: Jakob Westhoff <jakob@westhoffswelt.de>
Date: Mon, 30 Aug 2010 10:55:55 +0000 (+0200)
Subject: gtk+-2.0, gtk+-3.0: Make gtk_image_set_from_pixmap parameters be nullable.
X-Git-Tag: 0.11.0~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35f1233eac720daa996d10a966e728adcef09ecc;p=thirdparty%2Fvala.git

gtk+-2.0, gtk+-3.0: Make gtk_image_set_from_pixmap parameters be nullable.

Fixes bug 627778.
---

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index b37661401..34a933232 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -2225,7 +2225,7 @@ namespace Gtk {
 		public void set_from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
 		public void set_from_image (Gdk.Image gdk_image, Gdk.Bitmap mask);
 		public void set_from_pixbuf (Gdk.Pixbuf pixbuf);
-		public void set_from_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
+		public void set_from_pixmap (Gdk.Pixmap? pixmap, Gdk.Bitmap? mask);
 		public void set_from_stock (string stock_id, Gtk.IconSize size);
 		public void set_pixel_size (int pixel_size);
 		[NoAccessorMethod]
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index c9f7d8493..68c240162 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -2065,7 +2065,7 @@ namespace Gtk {
 		public void set_from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
 		public void set_from_image (Gdk.Image gdk_image, Gdk.Bitmap mask);
 		public void set_from_pixbuf (Gdk.Pixbuf pixbuf);
-		public void set_from_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
+		public void set_from_pixmap (Gdk.Pixmap? pixmap, Gdk.Bitmap? mask);
 		public void set_from_stock (string stock_id, Gtk.IconSize size);
 		public void set_pixel_size (int pixel_size);
 		[NoAccessorMethod]
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 2e7e8a53d..c58701b28 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -228,6 +228,8 @@ gtk_image_get_icon_set.size is_out="1"
 gtk_image_get_stock.stock_id is_out="1" transfer_ownership="1"
 gtk_image_get_stock.size is_out="1"
 gtk_image_menu_item_new_from_stock.accel_group nullable="1"
+gtk_image_set_from_pixmap.pixmap nullable="1"
+gtk_image_set_from_pixmap.mask nullable="1"
 GtkIMContext::delete_surrounding has_emitter="1"
 gtk_im_context_get_preedit_string.str is_out="1"
 gtk_im_context_get_preedit_string.attrs transfer_ownership="1"
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index b618475af..1173ae662 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -231,6 +231,8 @@ gtk_image_get_icon_set.size is_out="1"
 gtk_image_get_stock.stock_id is_out="1" transfer_ownership="1"
 gtk_image_get_stock.size is_out="1"
 gtk_image_menu_item_new_from_stock.accel_group nullable="1"
+gtk_image_set_from_pixmap.pixmap nullable="1"
+gtk_image_set_from_pixmap.mask nullable="1"
 GtkIMContext::delete_surrounding has_emitter="1"
 gtk_im_context_get_preedit_string.str is_out="1"
 gtk_im_context_get_preedit_string.attrs transfer_ownership="1"