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/BusDriver.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mono/BusDriver.cs') diff --git a/mono/BusDriver.cs b/mono/BusDriver.cs index 426dd370..b5885a32 100644 --- a/mono/BusDriver.cs +++ b/mono/BusDriver.cs @@ -3,9 +3,9 @@ namespace DBus using System; - public delegate void ServiceEventHandler (string serviceName, - string oldOwner, - string newOwner); + public delegate void NameOwnerChangedHandler (string name, + string oldOwner, + string newOwner); [Interface ("org.freedesktop.DBus")] public abstract class BusDriver @@ -14,14 +14,14 @@ namespace DBus public abstract string[] ListServices (); [Method] - public abstract string GetServiceOwner (string serviceName); + public abstract string GetOwner (string name); [Method] public abstract UInt32 GetConnectionUnixUser (string connectionName); [Signal] - public virtual event ServiceEventHandler ServiceOwnerChanged; + public virtual event NameOwnerChangedHandler NameOwnerChanged; static public BusDriver New (Connection connection) { -- cgit