Return-Path: From: "Gustavo F. Padovan" To: linux-bluetooth@vger.kernel.org Subject: [PATCH] Move HealthManager Interface to "/" path Date: Tue, 15 Feb 2011 16:31:46 -0300 Message-Id: <1297798306-32591-1-git-send-email-padovan@profusion.mobi> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Yeah, this breaks the API, but health is still disabled by default and it is not a good idea create a new path only for it. So moving it to "/" --- doc/health-api.txt | 2 +- health/hdp.c | 4 ++-- test/test-health | 2 +- test/test-health-sink | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/health-api.txt b/doc/health-api.txt index 3d0a717..9d5a54d 100644 --- a/doc/health-api.txt +++ b/doc/health-api.txt @@ -10,7 +10,7 @@ Health Device Profile hierarchy Service org.bluez Interface org.bluez.HealthManager -Object path /org/bluez/ +Object path / Methods: diff --git a/health/hdp.c b/health/hdp.c index d4a2a30..e58bd55 100644 --- a/health/hdp.c +++ b/health/hdp.c @@ -2171,7 +2171,7 @@ int hdp_manager_start(DBusConnection *conn) { DBG("Starting Health manager"); - if (!g_dbus_register_interface(conn, MANAGER_PATH, + if (!g_dbus_register_interface(conn, "/", HEALTH_MANAGER, health_manager_methods, NULL, NULL, NULL, manager_path_unregister)) { @@ -2186,7 +2186,7 @@ int hdp_manager_start(DBusConnection *conn) void hdp_manager_stop() { - g_dbus_unregister_interface(connection, MANAGER_PATH, HEALTH_MANAGER); + g_dbus_unregister_interface(connection, "/", HEALTH_MANAGER); dbus_connection_unref(connection); DBG("Stopped Health manager"); diff --git a/test/test-health b/test/test-health index 28cc894..7820a24 100755 --- a/test/test-health +++ b/test/test-health @@ -47,7 +47,7 @@ def enter_mainloop(): finally: print "Exiting, bye" -hdp_manager = dbus.Interface(bus.get_object("org.bluez", "/org/bluez"), +hdp_manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.HealthManager") role = None diff --git a/test/test-health-sink b/test/test-health-sink index cb9d434..50eb74c 100755 --- a/test/test-health-sink +++ b/test/test-health-sink @@ -12,7 +12,7 @@ loop = gobject.MainLoop() bus = dbus.SystemBus() -hdp_manager = dbus.Interface(bus.get_object("org.bluez", "/org/bluez"), +hdp_manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.HealthManager") app_path = hdp_manager.CreateApplication({"DataType": dbus.types.UInt16(4103), "Role": "sink"}) -- 1.7.4