From 55787fe87656df850390b6f17ff6254b729fe107 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 29 Jul 2009 10:06:42 -0500 Subject: [PATCH] Rename dbus_gsm_signal_array_property_changed --- drivers/atmodem/atmodem.c | 4 ++-- include/dbus.h | 6 ++++++ src/dbus-gsm.c | 2 +- src/dbus-gsm.h | 6 ------ src/manager.c | 4 ++-- src/modem.c | 2 +- src/network.c | 2 +- src/sim.c | 2 +- src/voicecall.c | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c index 4e3e5544..3e32147b 100644 --- a/drivers/atmodem/atmodem.c +++ b/drivers/atmodem/atmodem.c @@ -382,7 +382,7 @@ static void create_cb(GIOChannel *io, gboolean success, gpointer user) g_dbus_send_message(conn, reply); modem_list(&modems); - dbus_gsm_signal_array_property_changed(conn, "/", AT_MANAGER_INTERFACE, + ofono_dbus_signal_array_property_changed(conn, "/", AT_MANAGER_INTERFACE, "Modems", DBUS_TYPE_OBJECT_PATH, &modems); g_free(modems); @@ -447,7 +447,7 @@ static DBusMessage *manager_destroy(DBusConnection *conn, DBusMessage *msg, at_destroy(at); modem_list(&modems); - dbus_gsm_signal_array_property_changed(conn, "/", + ofono_dbus_signal_array_property_changed(conn, "/", AT_MANAGER_INTERFACE, "Modems", DBUS_TYPE_OBJECT_PATH, &modems); diff --git a/include/dbus.h b/include/dbus.h index 8a1db424..738c03a8 100644 --- a/include/dbus.h +++ b/include/dbus.h @@ -36,6 +36,12 @@ int ofono_dbus_signal_property_changed(DBusConnection *conn, const char *path, const char *interface, const char *name, int type, void *value); +int ofono_dbus_signal_array_property_changed(DBusConnection *conn, + const char *path, + const char *interface, + const char *name, int type, + void *value); + #ifdef __cplusplus } #endif diff --git a/src/dbus-gsm.c b/src/dbus-gsm.c index 260f6ec6..6ac3cd7f 100644 --- a/src/dbus-gsm.c +++ b/src/dbus-gsm.c @@ -141,7 +141,7 @@ int ofono_dbus_signal_property_changed(DBusConnection *conn, return g_dbus_send_message(conn, signal); } -int dbus_gsm_signal_array_property_changed(DBusConnection *conn, +int ofono_dbus_signal_array_property_changed(DBusConnection *conn, const char *path, const char *interface, const char *name, diff --git a/src/dbus-gsm.h b/src/dbus-gsm.h index 5c87b02b..32417a01 100644 --- a/src/dbus-gsm.h +++ b/src/dbus-gsm.h @@ -41,12 +41,6 @@ void dbus_gsm_dict_append_array(DBusMessageIter *dict, const char *key, int type, void *val); -int dbus_gsm_signal_array_property_changed(DBusConnection *conn, - const char *path, - const char *interface, - const char *name, int type, - void *value); - static inline void dbus_gsm_pending_reply(DBusMessage **msg, DBusMessage *reply) { DBusConnection *conn = ofono_dbus_get_connection(); diff --git a/src/manager.c b/src/manager.c index 2f1579c8..1dcd72ea 100644 --- a/src/manager.c +++ b/src/manager.c @@ -84,7 +84,7 @@ 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) { - dbus_gsm_signal_array_property_changed(conn, MANAGER_PATH, + ofono_dbus_signal_array_property_changed(conn, MANAGER_PATH, MANAGER_INTERFACE, "Modems", DBUS_TYPE_OBJECT_PATH, &modems); @@ -109,7 +109,7 @@ int ofono_modem_unregister(struct ofono_modem *m) g_modem_list = g_slist_remove(g_modem_list, modem); if (modem_list(&modems) == 0) { - dbus_gsm_signal_array_property_changed(conn, MANAGER_PATH, + ofono_dbus_signal_array_property_changed(conn, MANAGER_PATH, MANAGER_INTERFACE, "Modems", DBUS_TYPE_OBJECT_PATH, &modems); diff --git a/src/modem.c b/src/modem.c index 59a1fd5a..24f62afa 100644 --- a/src/modem.c +++ b/src/modem.c @@ -214,7 +214,7 @@ static gboolean trigger_interface_update(void *data) for (i = 0, l = info->interface_list; l; l = l->next, i++) interfaces[i] = l->data; - dbus_gsm_signal_array_property_changed(conn, modem->path, + ofono_dbus_signal_array_property_changed(conn, modem->path, MODEM_INTERFACE, "Interfaces", DBUS_TYPE_STRING, &interfaces); diff --git a/src/network.c b/src/network.c index eebecf20..098ef45d 100644 --- a/src/network.c +++ b/src/network.c @@ -283,7 +283,7 @@ static void network_operator_emit_available_operators(struct ofono_modem *modem) network_operator_populate_registered(modem, &network_operators); - dbus_gsm_signal_array_property_changed(conn, modem->path, + ofono_dbus_signal_array_property_changed(conn, modem->path, NETWORK_REGISTRATION_INTERFACE, "AvailableOperators", DBUS_TYPE_OBJECT_PATH, diff --git a/src/sim.c b/src/sim.c index f9025a9a..fa35d86f 100644 --- a/src/sim.c +++ b/src/sim.c @@ -227,7 +227,7 @@ check: own_numbers = get_own_numbers(sim->own_numbers); - dbus_gsm_signal_array_property_changed(conn, modem->path, + ofono_dbus_signal_array_property_changed(conn, modem->path, SIM_MANAGER_INTERFACE, "SubscriberNumbers", DBUS_TYPE_STRING, diff --git a/src/voicecall.c b/src/voicecall.c index 7c9e9d31..d8203acc 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -1137,7 +1137,7 @@ static gboolean real_emit_call_list_changed(void *data) voicecalls_path_list(modem, voicecalls->call_list, &objpath_list); - dbus_gsm_signal_array_property_changed(conn, modem->path, + ofono_dbus_signal_array_property_changed(conn, modem->path, VOICECALL_MANAGER_INTERFACE, "Calls", DBUS_TYPE_OBJECT_PATH, @@ -1174,7 +1174,7 @@ static gboolean real_emit_multiparty_call_list_changed(void *data) voicecalls_path_list(modem, voicecalls->multiparty_list, &objpath_list); - dbus_gsm_signal_array_property_changed(conn, modem->path, + ofono_dbus_signal_array_property_changed(conn, modem->path, VOICECALL_MANAGER_INTERFACE, "MultipartyCalls", DBUS_TYPE_OBJECT_PATH, &objpath_list);