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

Rename dbus_gsm_dict_append_array

This commit is contained in:
Denis Kenzior 2009-07-29 10:29:52 -05:00
parent 6728542a01
commit 9cd9338ba1
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/atmodem/atmodem.c
View File

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

3
include/dbus.h
View File

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

2
src/dbus-gsm.c
View File

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

3
src/dbus-gsm.h
View File

@ -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)
{

2
src/manager.c
View File

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

2
src/modem.c
View File

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

2
src/network.c
View File

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

2
src/sim.c
View File

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

4
src/voicecall.c
View File

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