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 c0a3f94b0ee305b75a9158b58978af933cfdb6bb..b56d1da192eeff8dbda40742ff65b588dab69af8 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -2004,7 +2004,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 92672a863de14243b01d23042259f2c463dc9e9a..cd40e8b1e432eb681f80b91209598d435c902911 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -1844,7 +1844,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 4f08505d2faf87cee98a90b8dcd5f4acc25bdee0..1764c587ee8d9783d2ff913122dcc16c3ef2c451 100644 (file)
--- 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 0714b01d42c3da08d1c12b6a2130587212fba7bd..ccd090176ecd748c5ba2bb3de9a98eebb7e3a164 100644 (file)
--- 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"