From ae95cbd17263259cb82c08e40aef9fad52ddff1f Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 23 Oct 2014 15:07:08 -0500 Subject: [PATCH] dbus: Use a #define for IWD_MANAGER_PATH --- src/dbus.h | 2 ++ src/manager.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/dbus.h b/src/dbus.h index 971ff7db..57b6f731 100644 --- a/src/dbus.h +++ b/src/dbus.h @@ -25,6 +25,8 @@ #define IWD_MANAGER_INTERFACE "net.connman.iwd.Manager" #define IWD_DEVICE_INTERFACE "net.connman.iwd.Device" +#define IWD_MANAGER_PATH "/" + struct l_dbus; struct l_dbus *dbus_get_bus(void); diff --git a/src/manager.c b/src/manager.c index 3d87fe89..4dbe37e5 100644 --- a/src/manager.c +++ b/src/manager.c @@ -71,7 +71,8 @@ static void setup_manager_interface(struct l_dbus_interface *interface) bool manager_init(struct l_dbus *dbus) { - if (!l_dbus_register_interface(dbus, "/", IWD_MANAGER_INTERFACE, + if (!l_dbus_register_interface(dbus, IWD_MANAGER_PATH, + IWD_MANAGER_INTERFACE, setup_manager_interface, NULL, NULL)) { l_info("Unable to register %s interface", IWD_MANAGER_INTERFACE); @@ -83,7 +84,8 @@ bool manager_init(struct l_dbus *dbus) bool manager_exit(struct l_dbus *dbus) { - l_dbus_unregister_interface(dbus, "/", IWD_MANAGER_INTERFACE); + l_dbus_unregister_interface(dbus, IWD_MANAGER_PATH, + IWD_MANAGER_INTERFACE); return true; }