From b0002eb697ec4b1e35846b51d9e6e1a7824e0b03 Mon Sep 17 00:00:00 2001 From: Joe Shaw Date: Tue, 25 Jan 2005 19:47:13 +0000 Subject: 2005-01-25 Joe Shaw * Land the mono binding changes to conform to the new APIs. * mono/Makefile.am: Remove Custom.cs, DBusType/Custom.cs, DBusType/Dict.cs, and DBusType/Nil.cs from the build. * mono/Arguments.cs (GetCodeAsString): Added. Returns the dbus type code as a string. (InitAppending): Rename dbus_message_append_iter_init() to dbus_message_iter_init_append(). * mono/BusDriver.cs: Rename ServiceEventHandler to NameOwnerChangedHandler. Rename GetServiceOwner to GetOwner. Rename ServiceOwnerChanged to NameOwnerChanged. * mono/Connection.cs: Rename BaseService to UniqueName, and the underlying C call. * mono/Custom.cs: Removed. The CUSTOM type has been removed. * mono/Service.cs: Rename Exists to HasOwner, internally rename dbus_bus_acquire_service() to dbus_bus_request_name(). * mono/DBusType/Array.cs (ctor): Use Type.GetElementType() instead of Type.UnderlyingSystemType to get the correct element type for the array. (ctor): Update code for new APIs: use dbus_message_iter_recurse(), dbus_message_get_{element|arg}_type() instead of dbus_message_iter_init_array_iterator(). (Append): Replace dbus_message_iter_append_array() with dbus_message_iter_open_container() and dbus_message_iter_close_container(). * mono/DBusType/Custom.cs, mono/DBusType/Nil.cs: Removed. These types have been removed. * mono/DBusType/*.cs: Replace calls of dbus_message_iter_get_[type]() to dbus_message_iter_get_basic(), but specify the type in the DllImport extern declaration. Ditto for dbus_message_iter_append_[type]() -> dbus_message_iter_append_basic(). * mono/example/BusListener.cs: Update for ServiceEventHandler -> NameOwnerChangedHandler. --- mono/DBusType/Nil.cs | 68 ---------------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 mono/DBusType/Nil.cs (limited to 'mono/DBusType/Nil.cs') diff --git a/mono/DBusType/Nil.cs b/mono/DBusType/Nil.cs deleted file mode 100644 index a271db3d..00000000 --- a/mono/DBusType/Nil.cs +++ /dev/null @@ -1,68 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using System.Reflection.Emit; - -using DBus; - -namespace DBus.DBusType -{ - /// - /// Marks a "void"/"unset"/"nonexistent"/"null" argument. - /// - public class Nil : IDBusType - { - public const char Code = 'v'; - - private Nil() - { - } - - public Nil(object nil, Service service) - { - } - - public Nil(IntPtr iter, Service service) - { - } - - public void Append(IntPtr iter) - { - if (!dbus_message_iter_append_nil(iter)) - throw new ApplicationException("Failed to append NIL argument"); - } - - public static bool Suits(System.Type type) - { - return false; - } - - public static void EmitMarshalIn(ILGenerator generator, Type type) - { - if (type.IsByRef) { - generator.Emit(OpCodes.Ldind_I1); - } - } - - public static void EmitMarshalOut(ILGenerator generator, Type type, bool isReturn) - { - generator.Emit(OpCodes.Unbox, type); - generator.Emit(OpCodes.Ldind_I1); - if (!isReturn) { - generator.Emit(OpCodes.Stind_I1); - } - } - - public object Get() - { - return null; - } - - public object Get(System.Type type) - { - throw new ArgumentException("Cannot cast DBus.Type.Nil to type '" + type.ToString() + "'"); - } - - [DllImport("dbus-1")] - private extern static bool dbus_message_iter_append_nil(IntPtr iter); - } -} -- cgit