diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2009-07-29 15:46:47 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2009-07-29 16:44:17 -0500 |
| commit | b50291466db12bf24e1aefa4dbf2bd29db65a33c (patch) | |
| tree | 0967e585ab63fc98f26fee9a3296d4aeb3f6d1bb /src/manager.c | |
| parent | 1e9580a044ce23226d1dcda33ad52ae1634b1c54 (diff) | |
| download | ofono-b50291466db12bf24e1aefa4dbf2bd29db65a33c.tar.bz2 | |
Move MANAGER_PATH to dbus.h
Diffstat (limited to 'src/manager.c')
| -rw-r--r-- | src/manager.c | 14 |
1 files changed, 8 insertions, 6 deletions
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); } |