From 142ca8fe0e5b4b8058d4913e909ccc820b6f7768 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Sat, 19 Jun 2010 23:09:11 +0200 Subject: [PATCH] Move ObjectPath class from dbus-glib-1 to glib-2.0 --- vapi/dbus-glib-1.vapi | 6 ------ vapi/glib-2.0.vapi | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vapi/dbus-glib-1.vapi b/vapi/dbus-glib-1.vapi index 62817ee16..6252921b1 100644 --- 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 139078d0f..bb964cc99 100644 --- 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")] -- 2.47.3