Commit a2111d71 authored by Rico Tzschichholz's avatar Rico Tzschichholz

gio-2.0: Use metadata instead of custom definitions for DBusMessage

parent 4123914c
......@@ -737,7 +737,7 @@ namespace GLib {
[Version (since = "2.32")]
public static GLib.DBusMenuModel @get (GLib.DBusConnection connection, string bus_name, string object_path);
}
[CCode (cheader_filename = "gio/gio.h")]
[CCode (cheader_filename = "gio/gio.h", type_id = "g_dbus_message_get_type ()")]
[Version (since = "2.26")]
public class DBusMessage : GLib.Object {
[CCode (has_construct_function = false)]
......@@ -768,7 +768,7 @@ namespace GLib {
public unowned GLib.UnixFDList get_unix_fd_list ();
public void @lock ();
[CCode (has_construct_function = false)]
public DBusMessage.method_call (string name, string path, string interface_, string method);
public DBusMessage.method_call (string? name, string path, string? interface_, string method);
[CCode (has_construct_function = false)]
[PrintfFormat]
public DBusMessage.method_error (GLib.DBusMessage method_call_message, string error_name, string error_message_format, ...);
......
......@@ -39,19 +39,6 @@ namespace GLib {
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 {
[CCode (has_construct_function = false)]
public DBusMessage.method_call (string name, string path, string interface_, string method);
[PrintfFormat, CCode (has_construct_function = false)]
public DBusMessage.method_error (GLib.DBusMessage method_call_message, string error_name, string error_message_format, ...);
[CCode (has_construct_function = false)]
public DBusMessage.method_error_literal (GLib.DBusMessage method_call_message, string error_name, string error_message);
[CCode (has_construct_function = false)]
public DBusMessage.method_error_valist (GLib.DBusMessage method_call_message, string error_name, string error_message_format, va_list var_args);
[CCode (has_construct_function = false)]
public DBusMessage.method_reply (GLib.DBusMessage method_call_message);
}
public class DataInputStream : GLib.BufferedInputStream {
[CCode (cname = "g_data_input_stream_read_line_async", finish_function = "g_data_input_stream_read_line_finish_utf8")]
public async string? read_line_utf8_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null, out size_t length) throws GLib.IOError, GLib.IOError;
......
......@@ -99,6 +99,8 @@ DBusConnection
DBusInterfaceSkeleton
.get_vtable skip=false nullable unowned=false
DBusMessage
.new_* skip=false symbol_type="constructor"
.new_method_error printf_format
.get_header_fields type="uchar[]"
.print.indent default=0
DBus*Info
......@@ -298,10 +300,6 @@ AsyncInitable
DBusConnection
.register_object skip
// Bug #: Construct methods not detected as such
DBusMessage
.new_method_* skip
// Bug #: Reparenting instance method breaks arguments
Socket
.connection_factory_create_connection skip // parent="GLib.SocketConnection" name="factory_create_connection"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment