From: Jürg Billeter <j@bitron.ch>
Date: Sat, 19 Jun 2010 21:09:11 +0000 (+0200)
Subject: Move ObjectPath class from dbus-glib-1 to glib-2.0
X-Git-Tag: 0.9.2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=142ca8fe0e5b4b8058d4913e909ccc820b6f7768;p=thirdparty%2Fvala.git

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 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")]