diff options
| author | Jürg Billeter <j@bitron.ch> | 2012-08-15 11:50:10 +0200 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2012-08-15 11:50:10 +0200 |
| commit | e75f3e95f9a8f7f3925cd46e88143e72c8ba7bc7 (patch) | |
| tree | 8b7c1cb523c627b1a437a5dbec4a9a0046b389da | |
| parent | 2499aa65087cb86c3194afb183bc82d687e0bb20 (diff) | |
| download | vala-e75f3e95f9a8f7f3925cd46e88143e72c8ba7bc7.tar.gz | |
gio-2.0: Fix g_dbus_connection_send_message_with_reply binding
| -rw-r--r-- | vapi/gio-2.0.vapi | 2 | ||||
| -rw-r--r-- | vapi/metadata/Gio-2.0-custom.vala | 3 | ||||
| -rw-r--r-- | vapi/metadata/Gio-2.0.metadata | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 7665870dc..76e7f356a 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -497,7 +497,7 @@ namespace GLib { public uint register_subtree (string object_path, GLib.DBusSubtreeVTable vtable, GLib.DBusSubtreeFlags flags, void* user_data, GLib.DestroyNotify user_data_free_func) throws GLib.Error; public void remove_filter (uint filter_id); public bool send_message (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, out uint32 out_serial) throws GLib.Error; - public async GLib.DBusMessage send_message_with_reply (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, int timeout_msec, out uint32 out_serial = null, GLib.Cancellable? cancellable = null) throws GLib.IOError; + public async GLib.DBusMessage send_message_with_reply (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, int timeout_msec, uint32* out_serial = null, GLib.Cancellable? cancellable = null) throws GLib.IOError; public GLib.DBusMessage send_message_with_reply_sync (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, int timeout_msec, out uint32 out_serial = null, GLib.Cancellable? cancellable = null) throws GLib.IOError; public void set_exit_on_close (bool exit_on_close); public uint signal_subscribe (string? sender, string? interface_name, string? member, string? object_path, string? arg0, GLib.DBusSignalFlags flags, owned GLib.DBusSignalCallback callback); diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala index 143ce689c..f7d2252d8 100644 --- a/vapi/metadata/Gio-2.0-custom.vala +++ b/vapi/metadata/Gio-2.0-custom.vala @@ -22,6 +22,7 @@ namespace GLib { public async T get_proxy<T> (string? name, string object_path, GLib.DBusProxyFlags flags = 0, GLib.Cancellable? cancellable = null) throws GLib.IOError; public T get_proxy_sync<T> (string? name, string object_path, GLib.DBusProxyFlags flags = 0, GLib.Cancellable? cancellable = null) throws GLib.IOError; public uint register_object<T> (string object_path, T object) throws GLib.IOError; + public async GLib.DBusMessage send_message_with_reply (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, int timeout_msec, uint32 *out_serial = null, GLib.Cancellable? cancellable = null) throws GLib.IOError; } public class DBusMessage : GLib.Object { @@ -595,4 +596,4 @@ namespace GLib { public delegate bool SettingsBindGetMappingShared (GLib.Value value, GLib.Variant variant, void* user_data); [CCode (cheader_filename = "gio/gio.h", has_target = false, cname = "GSettingsBindSetMapping")] public delegate GLib.Variant SettingsBindSetMappingShared (GLib.Value value, GLib.VariantType expected_type, void* user_data); -}
\ No newline at end of file +} diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata index dd30492be..e401b3665 100644 --- a/vapi/metadata/Gio-2.0.metadata +++ b/vapi/metadata/Gio-2.0.metadata @@ -325,6 +325,11 @@ StaticResource // Need to ask about this... annotated as out, but that seems wrong DBus*Info.generate_xml.string_builder out=false +// out_serial must not be out in the async function +DBusConnection + .send_message_with_reply skip + .send_message_with_reply_finish skip + // Back compat TlsCertificate abstract=false DataInputStream |