2 ===================================================================
3 RCS file: /cvs/gpe/base/gpe-bluetooth/dbus.c,v
4 retrieving revision 1.7
6 --- gpe-bluetooth/dbus.c 7 Sep 2004 00:01:27 -0000 1.7
7 +++ gpe-bluetooth/dbus.c 9 Jan 2005 13:56:46 -0000
10 - * Copyright (C) 2002, 2003, 2004 Philip Blundell <philb@gnu.org>
11 + * Copyright (C) 2002, 2003, 2004, 2005 Philip Blundell <philb@gnu.org>
13 * This program is free software; you can redistribute it and/or
14 * modify it under the terms of the GNU General Public License
17 #define _(x) gettext(x)
19 -#define SERVICE_NAME "org.handhelds.gpe.bluez"
20 -#define PIN_INTERFACE_NAME SERVICE_NAME ".PinAgent"
21 -#define OBEX_INTERFACE_NAME SERVICE_NAME ".OBEX"
22 +#define PIN_SERVICE_NAME "org.bluez.PinAgent"
23 +#define PIN_INTERFACE_NAME PIN_SERVICE_NAME
25 +#define OBEX_SERVICE_NAME "org.handhelds.gpe.bluez"
26 +#define OBEX_INTERFACE_NAME OBEX_SERVICE_NAME ".OBEX"
28 extern DBusHandlerResult bluez_pin_handle_dbus_request (DBusConnection *connection, DBusMessage *message);
29 extern DBusHandlerResult obex_client_handle_dbus_request (DBusConnection *connection, DBusMessage *message);
32 dbus_connection_register_object_path (connection, object_path1, &dbus_pin_vtable, NULL);
34 - dbus_bus_acquire_service (connection, SERVICE_NAME, 0, &error);
35 + dbus_bus_acquire_service (connection, PIN_SERVICE_NAME, 0, &error);
36 if (dbus_error_is_set (&error))
38 gpe_error_box_fmt (_("Failed to acquire service: %s"), error.message);
41 dbus_connection_register_object_path (connection, object_path2, &dbus_obex_vtable, NULL);
43 - dbus_bus_acquire_service (connection, SERVICE_NAME, 0, &error);
44 + dbus_bus_acquire_service (connection, OBEX_SERVICE_NAME, 0, &error);
45 if (dbus_error_is_set (&error))
47 gpe_error_box_fmt (_("Failed to acquire service: %s"), error.message);