[vala/staging] vapi: Regenerate GIR-based bindings to fix non-standard error position
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/staging] vapi: Regenerate GIR-based bindings to fix non-standard error position
- Date: Thu, 10 Jan 2019 12:43:09 +0000 (UTC)
commit 9a7c621d6523191922438f8649490e3a4909760f
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Thu Jan 10 11:32:13 2019 +0100
vapi: Regenerate GIR-based bindings to fix non-standard error position
Fixes https://gitlab.gnome.org/GNOME/vala/issues/265
vapi/gdk-pixbuf-2.0.vapi | 4 ++--
vapi/gio-2.0.vapi | 8 ++++----
vapi/metadata/GdkPixbuf-2.0.metadata | 1 -
vapi/metadata/Gio-2.0.metadata | 1 -
4 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index 3320618ed..f9729b696 100644
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -311,9 +311,9 @@ namespace Gdk {
}
[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", instance_pos = 1.9)]
public delegate void PixbufDestroyNotify ([CCode (array_length = false)] uint8[] pixels);
- [CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", instance_pos = 2.9)]
+ [CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", error_pos = 1.8, instance_pos = 1.9)]
[Version (since = "2.4")]
- public delegate bool PixbufSaveFunc ([CCode (array_length_cname = "count", array_length_pos = 1.5,
array_length_type = "gsize")] uint8[] buf, out GLib.Error error);
+ public delegate bool PixbufSaveFunc ([CCode (array_length_cname = "count", array_length_pos = 1.1,
array_length_type = "gsize")] uint8[] buf) throws GLib.Error;
[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cname = "GDK_PIXBUF_FEATURES_H")]
public const int PIXBUF_FEATURES_H;
[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cname = "GDK_PIXBUF_MAGIC_NUMBER")]
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 7084bf0e5..8a327d6df 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -4774,15 +4774,15 @@ namespace GLib {
[CCode (cheader_filename = "gio/gio.h", instance_pos = 1.9)]
[Version (since = "2.28")]
public delegate bool CancellableSourceFunc (GLib.Cancellable? cancellable = null);
- [CCode (cheader_filename = "gio/gio.h", instance_pos = 6.9)]
+ [CCode (cheader_filename = "gio/gio.h", error_pos = 5.8, instance_pos = 5.9)]
[Version (since = "2.26")]
- public delegate GLib.Variant DBusInterfaceGetPropertyFunc (GLib.DBusConnection connection, string
sender, string object_path, string interface_name, string property_name, out GLib.Error error);
+ public delegate GLib.Variant DBusInterfaceGetPropertyFunc (GLib.DBusConnection connection, string
sender, string object_path, string interface_name, string property_name) throws GLib.Error;
[CCode (cheader_filename = "gio/gio.h", instance_pos = 7.9)]
[Version (since = "2.26")]
public delegate void DBusInterfaceMethodCallFunc (GLib.DBusConnection connection, string sender,
string object_path, string interface_name, string method_name, GLib.Variant parameters, owned
GLib.DBusMethodInvocation invocation);
- [CCode (cheader_filename = "gio/gio.h", instance_pos = 7.9)]
+ [CCode (cheader_filename = "gio/gio.h", error_pos = 6.8, instance_pos = 6.9)]
[Version (since = "2.26")]
- public delegate bool DBusInterfaceSetPropertyFunc (GLib.DBusConnection connection, string sender,
string object_path, string interface_name, string property_name, GLib.Variant value, out GLib.Error error);
+ public delegate bool DBusInterfaceSetPropertyFunc (GLib.DBusConnection connection, string sender,
string object_path, string interface_name, string property_name, GLib.Variant value) throws GLib.Error;
[CCode (cheader_filename = "gio/gio.h", instance_pos = 3.9)]
[Version (since = "2.26")]
public delegate GLib.DBusMessage? DBusMessageFilterFunction (GLib.DBusConnection connection, owned
GLib.DBusMessage message, bool incoming);
diff --git a/vapi/metadata/GdkPixbuf-2.0.metadata b/vapi/metadata/GdkPixbuf-2.0.metadata
index e73ab0b24..64795f7c8 100644
--- a/vapi/metadata/GdkPixbuf-2.0.metadata
+++ b/vapi/metadata/GdkPixbuf-2.0.metadata
@@ -25,6 +25,5 @@ Pixbuf
Pixbuf
.new_from_data.destroy_fn default=GLib.free
-// Bug #666798: delegates which throw exceptions
// Issue #728: Support non-default error parameter position
PixbufSaveFunc.error out unowned=false
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index d27471064..9271e724c 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -325,7 +325,6 @@ DBusConnection
LoadableIcon
.load.type nullable
-// Bug #666798: GIR parser should detect delegate types which throw errors
// Issue #728: Support non-default error parameter position
DBusInterfaceGetPropertyFunc.error out unowned=false
DBusInterfaceSetPropertyFunc.error out unowned=false
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]