From b50291466db12bf24e1aefa4dbf2bd29db65a33c Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 29 Jul 2009 15:46:47 -0500 Subject: [PATCH] Move MANAGER_PATH to dbus.h --- include/dbus.h | 1 + src/manager.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/dbus.h b/include/dbus.h index c470ba3f..9b85b22e 100644 --- a/include/dbus.h +++ b/include/dbus.h @@ -30,6 +30,7 @@ extern "C" { #define OFONO_SERVICE "org.ofono" #define OFONO_MANAGER_INTERFACE "org.ofono.Manager" +#define OFONO_MANAGER_PATH "/" /* Essentially a{sv} */ #define OFONO_PROPERTIES_ARRAY_SIGNATURE DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING \ diff --git a/src/manager.c b/src/manager.c index 2f13f279..92437a2c 100644 --- a/src/manager.c +++ b/src/manager.c @@ -32,8 +32,6 @@ #include "modem.h" #include "driver.h" -#define MANAGER_PATH "/" - static GSList *g_modem_list = NULL; static int g_next_modem_id = 1; @@ -80,7 +78,8 @@ struct ofono_modem *ofono_modem_register(struct ofono_modem_attribute_ops *ops) g_modem_list = g_slist_prepend(g_modem_list, modem); if (modem_list(&modems) == 0) { - ofono_dbus_signal_array_property_changed(conn, MANAGER_PATH, + ofono_dbus_signal_array_property_changed(conn, + OFONO_MANAGER_PATH, OFONO_MANAGER_INTERFACE, "Modems", DBUS_TYPE_OBJECT_PATH, &modems); @@ -105,7 +104,8 @@ int ofono_modem_unregister(struct ofono_modem *m) g_modem_list = g_slist_remove(g_modem_list, modem); if (modem_list(&modems) == 0) { - ofono_dbus_signal_array_property_changed(conn, MANAGER_PATH, + ofono_dbus_signal_array_property_changed(conn, + OFONO_MANAGER_PATH, OFONO_MANAGER_INTERFACE, "Modems", DBUS_TYPE_OBJECT_PATH, &modems); @@ -161,7 +161,8 @@ int __ofono_manager_init() DBusConnection *conn = ofono_dbus_get_connection(); gboolean ret; - ret = g_dbus_register_interface(conn, "/", OFONO_MANAGER_INTERFACE, + ret = g_dbus_register_interface(conn, OFONO_MANAGER_PATH, + OFONO_MANAGER_INTERFACE, manager_methods, manager_signals, NULL, NULL, NULL); @@ -192,5 +193,6 @@ void __ofono_manager_cleanup() g_slist_free(g_modem_list); g_modem_list = 0; - g_dbus_unregister_interface(conn, "/", OFONO_MANAGER_INTERFACE); + g_dbus_unregister_interface(conn, OFONO_MANAGER_PATH, + OFONO_MANAGER_INTERFACE); }