[vala] gtk+-2.0, gtk+-3.0: Make gtk_image_set_from_pixmap parameters be nullable.
- From: Luca Bruno <lucabru src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] gtk+-2.0, gtk+-3.0: Make gtk_image_set_from_pixmap parameters be nullable.
- Date: Mon, 30 Aug 2010 10:57:36 +0000 (UTC)
commit 35f1233eac720daa996d10a966e728adcef09ecc
Author: Jakob Westhoff <jakob westhoffswelt de>
Date: Mon Aug 30 12:55:55 2010 +0200
gtk+-2.0, gtk+-3.0: Make gtk_image_set_from_pixmap parameters be nullable.
Fixes bug 627778.
vapi/gtk+-2.0.vapi | 2 +-
vapi/gtk+-3.0.vapi | 2 +-
vapi/packages/gtk+-2.0/gtk+-2.0.metadata | 2 ++
vapi/packages/gtk+-3.0/gtk+-3.0.metadata | 2 ++
4 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index b376614..34a9332 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 c9f7d84..68c2401 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 2e7e8a5..c58701b 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 b618475..1173ae6 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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]