From 9cd9338ba1322f757ecd1a50121053ab1a4e8df3 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 29 Jul 2009 10:29:52 -0500 Subject: [PATCH] Rename dbus_gsm_dict_append_array --- drivers/atmodem/atmodem.c | 2 +- include/dbus.h | 3 +++ src/dbus-gsm.c | 2 +- src/dbus-gsm.h | 3 --- src/manager.c | 2 +- src/modem.c | 2 +- src/network.c | 2 +- src/sim.c | 2 +- src/voicecall.c | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c index 898b823f..fff6cca4 100644 --- a/drivers/atmodem/atmodem.c +++ b/drivers/atmodem/atmodem.c @@ -479,7 +479,7 @@ static DBusMessage *manager_get_properties(DBusConnection *conn, OFONO_PROPERTIES_ARRAY_SIGNATURE, &dict); - dbus_gsm_dict_append_array(&dict, "Modems", DBUS_TYPE_OBJECT_PATH, + ofono_dbus_dict_append_array(&dict, "Modems", DBUS_TYPE_OBJECT_PATH, &modems); g_free(modems); diff --git a/include/dbus.h b/include/dbus.h index 8df49e2e..54d6daa2 100644 --- a/include/dbus.h +++ b/include/dbus.h @@ -41,6 +41,9 @@ DBusConnection *ofono_dbus_get_connection(); void ofono_dbus_dict_append(DBusMessageIter *dict, const char *key, int type, void *value); +void ofono_dbus_dict_append_array(DBusMessageIter *dict, const char *key, + int type, void *val); + int ofono_dbus_signal_property_changed(DBusConnection *conn, const char *path, const char *interface, const char *name, int type, void *value); diff --git a/src/dbus-gsm.c b/src/dbus-gsm.c index ed708cc7..0b387fe0 100644 --- a/src/dbus-gsm.c +++ b/src/dbus-gsm.c @@ -100,7 +100,7 @@ void dbus_gsm_append_array_variant(DBusMessageIter *iter, int type, void *val) dbus_message_iter_close_container(iter, &variant); } -void dbus_gsm_dict_append_array(DBusMessageIter *dict, const char *key, +void ofono_dbus_dict_append_array(DBusMessageIter *dict, const char *key, int type, void *val) { DBusMessageIter entry; diff --git a/src/dbus-gsm.h b/src/dbus-gsm.h index 5cc611c3..d8cd0aee 100644 --- a/src/dbus-gsm.h +++ b/src/dbus-gsm.h @@ -28,9 +28,6 @@ void dbus_gsm_append_variant(DBusMessageIter *iter, int type, void *value); void dbus_gsm_append_array_variant(DBusMessageIter *iter, int type, void *val); -void dbus_gsm_dict_append_array(DBusMessageIter *dict, const char *key, - int type, void *val); - static inline void dbus_gsm_pending_reply(DBusMessage **msg, DBusMessage *reply) { diff --git a/src/manager.c b/src/manager.c index 00ebe130..93414658 100644 --- a/src/manager.c +++ b/src/manager.c @@ -140,7 +140,7 @@ static DBusMessage *manager_get_properties(DBusConnection *conn, OFONO_PROPERTIES_ARRAY_SIGNATURE, &dict); - dbus_gsm_dict_append_array(&dict, "Modems", DBUS_TYPE_OBJECT_PATH, + ofono_dbus_dict_append_array(&dict, "Modems", DBUS_TYPE_OBJECT_PATH, &modems); g_free(modems); diff --git a/src/modem.c b/src/modem.c index 3555ae60..684527f6 100644 --- a/src/modem.c +++ b/src/modem.c @@ -166,7 +166,7 @@ static DBusMessage *generate_properties_reply(struct ofono_modem *modem, for (i = 0, l = info->interface_list; l; l = l->next, i++) interfaces[i] = l->data; - dbus_gsm_dict_append_array(&dict, "Interfaces", DBUS_TYPE_STRING, + ofono_dbus_dict_append_array(&dict, "Interfaces", DBUS_TYPE_STRING, &interfaces); g_free(interfaces); diff --git a/src/network.c b/src/network.c index faf034ed..5f0fed98 100644 --- a/src/network.c +++ b/src/network.c @@ -732,7 +732,7 @@ static DBusMessage *network_get_properties(DBusConnection *conn, network_operator_populate_registered(modem, &network_operators); - dbus_gsm_dict_append_array(&dict, "AvailableOperators", + ofono_dbus_dict_append_array(&dict, "AvailableOperators", DBUS_TYPE_OBJECT_PATH, &network_operators); diff --git a/src/sim.c b/src/sim.c index 25fca1e8..315252df 100644 --- a/src/sim.c +++ b/src/sim.c @@ -154,7 +154,7 @@ static DBusMessage *sim_get_properties(DBusConnection *conn, own_numbers = get_own_numbers(sim->own_numbers); - dbus_gsm_dict_append_array(&dict, "SubscriberNumbers", + ofono_dbus_dict_append_array(&dict, "SubscriberNumbers", DBUS_TYPE_STRING, &own_numbers); g_strfreev(own_numbers); diff --git a/src/voicecall.c b/src/voicecall.c index b1919e89..2d8669c1 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -713,14 +713,14 @@ static DBusMessage *manager_get_properties(DBusConnection *conn, voicecalls_path_list(modem, calls->call_list, &callobj_list); - dbus_gsm_dict_append_array(&dict, "Calls", DBUS_TYPE_OBJECT_PATH, + ofono_dbus_dict_append_array(&dict, "Calls", DBUS_TYPE_OBJECT_PATH, &callobj_list); g_strfreev(callobj_list); voicecalls_path_list(modem, calls->multiparty_list, &callobj_list); - dbus_gsm_dict_append_array(&dict, "MultipartyCalls", + ofono_dbus_dict_append_array(&dict, "MultipartyCalls", DBUS_TYPE_OBJECT_PATH, &callobj_list); g_strfreev(callobj_list);