--- bluez-pin-0.24/main.c.new_dbus_api	2005-03-08 15:48:40.387474000 -0500
+++ bluez-pin-0.24/main.c	2005-03-08 16:20:23.114842000 -0500
@@ -47,8 +47,8 @@
     return bluez_pin_handle_dbus_request (connection, message);
 
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
-                              "Disconnected"))
+                              DBUS_INTERFACE_DBUS,
+                              "NameLost"))
     exit (0);
   
   return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
@@ -84,7 +84,7 @@
   dbus_connection_register_object_path (connection, new_object_path, &dbus_vtable, NULL);
   dbus_connection_register_object_path (connection, old_object_path, &dbus_vtable, NULL);
 
-  dbus_bus_acquire_service (connection, NEW_SERVICE_NAME, 0, &error);
+  dbus_bus_request_name (connection, NEW_SERVICE_NAME, 0, &error);
   if (dbus_error_is_set (&error))
     {
       fprintf (stderr, "Failed to acquire %s service: %s\n", NEW_SERVICE_NAME, error.message);
@@ -92,7 +92,7 @@
       errors++;
     }
 
-  dbus_bus_acquire_service (connection, OLD_SERVICE_NAME, 0, &error);
+  dbus_bus_request_name (connection, OLD_SERVICE_NAME, 0, &error);
   if (dbus_error_is_set (&error))
     {
       fprintf (stderr, "Failed to acquire %s service: %s\n", OLD_SERVICE_NAME, error.message);
--- bluez-pin-0.24/pin-dbus.c.new_dbus_api	2005-03-08 16:08:26.829844000 -0500
+++ bluez-pin-0.24/pin-dbus.c	2005-03-08 16:23:15.143641000 -0500
@@ -41,9 +41,9 @@
 {
   DBusMessageIter iter;
 
-  dbus_message_append_iter_init (message, &iter);
+  dbus_message_iter_init_append (message, &iter);
   if (pin)
-    dbus_message_iter_append_string (&iter, pin);
+    dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &pin);
 
   dbus_connection_send (connection, message, NULL);
 
@@ -86,7 +86,7 @@
     goto error;
   }
 
-  out = dbus_message_iter_get_boolean (&iter);
+  dbus_message_iter_get_basic (&iter, &out);
 
   if (! dbus_message_iter_next (&iter))
     {
@@ -96,9 +96,9 @@
     }
 
   type = dbus_message_iter_get_arg_type (&iter);
+  dbus_message_iter_get_fixed_array (&iter, &bytes, &nbytes);
 
   if (type != DBUS_TYPE_ARRAY
-      || ! dbus_message_iter_get_byte_array (&iter, &bytes, &nbytes)
       || nbytes != sizeof (bdaddr))
   {
     reply = dbus_message_new_error (message, WRONG_ARGS_ERROR,