Move ObjectPath class from dbus-glib-1 to glib-2.0

diff --git a/vapi/dbus-glib-1.vapi b/vapi/dbus-glib-1.vapi
index 62817ee16bdb7fa93063044d4702cb8e88adcb62..6252921b106b2f0a809508cfeced72b5a13b43e1 100644 (file)
--- a/vapi/dbus-glib-1.vapi
+++ b/vapi/dbus-glib-1.vapi
@@ -269,12 +269,6 @@ namespace DBus {
                public signal void destroy ();
        }
 
-       [CCode (cname = "char", const_cname = "const char", copy_function = "g_strdup", free_function = "g_free", cheader_filename = "stdlib.h,string.h,glib.h", type_id = "DBUS_TYPE_G_OBJECT_PATH", marshaller_type_name = "BOXED", get_value_function = "g_value_get_boxed", set_value_function = "g_value_set_boxed", type_signature = "o")]
-       public class ObjectPath : string {
-               [CCode (cname = "g_strdup")]
-               public ObjectPath (string path);
-       }
-
        [CCode (cname = "char", const_cname = "const char", copy_function = "g_strdup", free_function = "g_free", cheader_filename = "stdlib.h,string.h,glib.h", type_id = "G_TYPE_STRING", marshaller_type_name = "STRING", get_value_function = "g_value_get_string", set_value_function = "g_value_set_string")]
        public class BusName : string {
                [CCode (cname = "g_strdup")]

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 139078d0f9fa1118e618bce8b6492dce8839f5a7..bb964cc997f0ba0cf589e5cca1f47632e878dd2d 100644 (file)
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -4007,6 +4007,12 @@ namespace GLib {
                public Variant end ();
        }
 
+       [CCode (cname = "char", const_cname = "const char", copy_function = "g_strdup", free_function = "g_free", cheader_filename = "stdlib.h,string.h,glib.h", type_id = "DBUS_TYPE_G_OBJECT_PATH", marshaller_type_name = "BOXED", get_value_function = "g_value_get_boxed", set_value_function = "g_value_set_boxed", type_signature = "o")]
+       public class ObjectPath : string {
+               [CCode (cname = "g_strdup")]
+               public ObjectPath (string path);
+       }
+
        [CCode (cname = "G_LIKELY", cheader_filename = "glib.h")]
        public static bool likely (bool expression);
        [CCode (cname = "G_UNLIKELY", cheader_filename = "glib.h")]