summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-03-27 10:18:44 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-03-27 10:18:44 +0000
commitd93651492d899c8fb4692207f44e44ac1e2049f5 (patch)
tree8fe862c48837085967b6d862c7593e04169619be /common
parentfe864ec0e6fe3e9be945cf1c02e5f343593c883f (diff)
Rename register_service() function to avoid conflicts
Diffstat (limited to 'common')
-rw-r--r--common/dbus.c2
-rw-r--r--common/dbus.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/dbus.c b/common/dbus.c
index e4bcbba5..db50fcc9 100644
--- a/common/dbus.c
+++ b/common/dbus.c
@@ -646,7 +646,7 @@ int set_nonblocking(int fd)
return 0;
}
-void register_service(DBusConnection *conn, const char *identifier,
+void register_external_service(DBusConnection *conn, const char *identifier,
const char *name, const char *description)
{
DBusMessage *msg, *reply;
diff --git a/common/dbus.h b/common/dbus.h
index 692db0ac..26ccb6e0 100644
--- a/common/dbus.h
+++ b/common/dbus.h
@@ -57,7 +57,7 @@ static inline DBusHandlerResult send_message_and_unref(DBusConnection *conn, DBu
int set_nonblocking(int fd);
-void register_service(DBusConnection *conn, const char *identifier,
+void register_external_service(DBusConnection *conn, const char *identifier,
const char *name, const char *description);
#endif /* __H_BLUEZ_DBUS_H__ */