sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Move MANAGER_PATH to dbus.h

This commit is contained in:
Denis Kenzior 2009-07-29 15:46:47 -05:00
parent 1e9580a044
commit b50291466d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/dbus.h
View File

@ -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 \

14
src/manager.c
View File

@ -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);
}