[vala/wip/gio-2.0] gio-2.0: Use metadata instead of custom definitions for DBusMessage

[Rico Tzschichholz <ricotz src gnome org>]

commit 33a14b2a98c8a2f4f86e88e9285a8c8926307f58
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sat Sep 24 11:01:13 2016 +0200

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

 vapi/gio-2.0.vapi                 |    4 ++--
 vapi/metadata/Gio-2.0-custom.vala |   13 -------------
 vapi/metadata/Gio-2.0.metadata    |    6 ++----
 3 files changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 9397339..221da9e 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -741,7 +741,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)]
@@ -772,7 +772,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, ...);
diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala
index 4965267..609334e 100644
--- a/vapi/metadata/Gio-2.0-custom.vala
+++ b/vapi/metadata/Gio-2.0-custom.vala
@@ -42,19 +42,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;
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 595e77a..ddff613 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -105,6 +105,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
@@ -300,10 +302,6 @@ tls_* skip
 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"