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 b37661401634b23041fd6636ecaf3702e3d544fc..34a933232cfaa2273cec07eb68356b70068df20c 100644 (file)
--- 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 c9f7d84931196985b2fe7ac6257421dd3fa4fd39..68c2401623581d23fc86b50bbfb5eb4dfa470144 100644 (file)
--- 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 2e7e8a53d4fd201cc161dbc17d5a8feb0e5eef36..c58701b28cb02a41a1c3da8d6934e9c7725d430a 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 b618475af5ab805ce2a4d4bc3ba963b71a18f49f..1173ae662c687c31f5ab3f1ca9e6c622152b11ba 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"