[PATCH -v2] Move HealthManager Interface to "/" path

["Gustavo F. Padovan" <padovan@profusion.mobi>]

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          |    6 +++---
 health/hdp_types.h    |    2 --
 test/test-health      |    2 +-
 test/test-health-sink |    2 +-
 5 files changed, 6 insertions(+), 8 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..ae20a1f 100644
--- a/health/hdp.c
+++ b/health/hdp.c
@@ -290,7 +290,7 @@ static gboolean set_app_path(struct hdp_application *app)
 	app->id = get_app_id();
 	if (!app->id)
 		return FALSE;
-	app->path = g_strdup_printf(MANAGER_PATH "/health_app_%d", app->id);
+	app->path = g_strdup_printf("/health_app_%d", app->id);
 
 	return TRUE;
 };
@@ -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/health/hdp_types.h b/health/hdp_types.h
index 7d23293..466f8c6 100644
--- a/health/hdp_types.h
+++ b/health/hdp_types.h
@@ -30,8 +30,6 @@
 #define HDP_SOURCE_UUID		"00001401-0000-1000-8000-00805F9B34FB"
 #define HDP_SINK_UUID		"00001402-0000-1000-8000-00805F9B34FB"
 
-#define MANAGER_PATH		"/org/bluez"
-
 #define HEALTH_MANAGER		"org.bluez.HealthManager"
 #define HEALTH_DEVICE		"org.bluez.HealthDevice"
 #define HEALTH_CHANNEL		"org.bluez.HealthChannel"
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