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

Move & Rename PROPERTIES_ARRAY_SIGNATURE

This commit is contained in:
Denis Kenzior 2009-07-29 10:26:38 -05:00
parent 55787fe876
commit d9025e13e1
13 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/atmodem/atmodem.c
View File

@ -476,7 +476,8 @@ static DBusMessage *manager_get_properties(DBusConnection *conn,
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE, &dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
dbus_gsm_dict_append_array(&dict, "Modems", DBUS_TYPE_OBJECT_PATH,
&modems);

6
include/dbus.h
View File

@ -30,6 +30,12 @@ extern "C" {
#define OFONO_SERVICE "org.ofono"
/* Essentially a{sv} */
#define OFONO_PROPERTIES_ARRAY_SIGNATURE DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING \
DBUS_TYPE_STRING_AS_STRING \
DBUS_TYPE_VARIANT_AS_STRING \
DBUS_DICT_ENTRY_END_CHAR_AS_STRING
DBusConnection *ofono_dbus_get_connection();
int ofono_dbus_signal_property_changed(DBusConnection *conn, const char *path,

6
src/call-barring.c
View File

@ -257,7 +257,8 @@ static void generate_ss_query_reply(struct ofono_modem *modem)
dbus_message_iter_append_basic(&vstruct, DBUS_TYPE_STRING, &ss_fac);
dbus_message_iter_open_container(&vstruct, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE, &dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
/* We report all affected locks only for the special case ones */
if (cb->ss_req_lock <= CB_ALL_END) {
@ -647,7 +648,8 @@ static void cb_get_properties_reply(struct ofono_modem *modem, int mask)
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE, &dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
for (j = 1; j <= BEARER_CLASS_PAD; j = j << 1) {
if ((j & mask) == 0)

4
src/call-forwarding.c
View File

@ -387,7 +387,7 @@ static DBusMessage *cf_get_properties_reply(DBusMessage *msg,
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE,
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
for (i = 0; i < 4; i++)
@ -812,7 +812,7 @@ static DBusMessage *cf_ss_control_reply(struct ofono_modem *modem,
&cf_type);
dbus_message_iter_open_container(&vstruct, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE, &dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE, &dict);
if (req->cf_type == CALL_FORWARDING_TYPE_UNCONDITIONAL ||
req->cf_type == CALL_FORWARDING_TYPE_ALL)

3
src/call-meter.c
View File

@ -178,7 +178,8 @@ static void cm_get_properties_reply(struct ofono_modem *modem)
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE, &dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
dbus_gsm_dict_append(&dict, "CallMeter", DBUS_TYPE_UINT32,
&cm->call_meter);

7
src/call-settings.c
View File

@ -326,7 +326,8 @@ static void generate_cw_ss_query_reply(struct ofono_modem *modem)
&ss_type);
dbus_message_iter_open_container(&vstruct, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE, &dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
property_append_cw_conditions(&dict, cs->cw, cs->ss_req_cls);
@ -780,8 +781,8 @@ static DBusMessage *generate_get_properties_reply(struct ofono_modem *modem,
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE,
&dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
str = clip_status_to_string(cs->clip);
dbus_gsm_dict_append(&dict, "CallingLinePresentation",

6
src/dbus-gsm.h
View File

@ -24,12 +24,6 @@
#define MAX_DBUS_PATH_LEN 64
/* Essentially a{sv} */
#define PROPERTIES_ARRAY_SIGNATURE DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING \
DBUS_TYPE_STRING_AS_STRING \
DBUS_TYPE_VARIANT_AS_STRING \
DBUS_DICT_ENTRY_END_CHAR_AS_STRING
void dbus_gsm_dict_append(DBusMessageIter *dict, const char *key, int type,
void *value);

4
src/manager.c
View File

@ -137,8 +137,8 @@ static DBusMessage *manager_get_properties(DBusConnection *conn,
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE,
&dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
dbus_gsm_dict_append_array(&dict, "Modems", DBUS_TYPE_OBJECT_PATH,
&modems);

4
src/modem.c
View File

@ -143,8 +143,8 @@ static DBusMessage *generate_properties_reply(struct ofono_modem *modem,
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE,
&dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
if (info->manufacturer)
dbus_gsm_dict_append(&dict, "Manufacturer", DBUS_TYPE_STRING,

4
src/network.c
View File

@ -509,8 +509,8 @@ static DBusMessage *network_operator_get_properties(DBusConnection *conn,
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE,
&dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
dbus_gsm_dict_append(&dict, "Name", DBUS_TYPE_STRING, &name);

4
src/sim.c
View File

@ -145,8 +145,8 @@ static DBusMessage *sim_get_properties(DBusConnection *conn,
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE,
&dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
if (sim->imsi)
dbus_gsm_dict_append(&dict, "SubscriberIdentity",

4
src/sms.c
View File

@ -139,7 +139,7 @@ static DBusMessage *generate_get_properties_reply(struct ofono_modem *modem,
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE,
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
sca = phone_number_to_string(&sms->sca);
@ -499,7 +499,7 @@ static void dispatch_text_message(struct ofono_modem *modem,
dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &message);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE,
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
ts = sms_scts_to_time(scts, &remote);

7
src/voicecall.c
View File

@ -165,8 +165,8 @@ static DBusMessage *voicecall_get_properties(DBusConnection *conn,
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE,
&dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
dbus_gsm_dict_append(&dict, "State", DBUS_TYPE_STRING, &status);
@ -708,7 +708,8 @@ static DBusMessage *manager_get_properties(DBusConnection *conn,
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
PROPERTIES_ARRAY_SIGNATURE, &dict);
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
voicecalls_path_list(modem, calls->call_list, &callobj_list);