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

Rename dbus_gsm_dict_append

This commit is contained in:
Denis Kenzior 2009-07-29 10:26:55 -05:00
parent d9025e13e1
commit 6728542a01
12 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/dbus.h
View File

@ -38,6 +38,9 @@ extern "C" {
DBusConnection *ofono_dbus_get_connection();
void ofono_dbus_dict_append(DBusMessageIter *dict, const char *key, int type,
void *value);
int ofono_dbus_signal_property_changed(DBusConnection *conn, const char *path,
const char *interface, const char *name,
int type, void *value);

4
src/call-barring.c
View File

@ -167,7 +167,7 @@ static void cb_ss_property_append(struct call_barring_data *cb,
bearer_class_to_string(i),
cb_locks[lock].name);
dbus_gsm_dict_append(dict, property_name, DBUS_TYPE_STRING,
ofono_dbus_dict_append(dict, property_name, DBUS_TYPE_STRING,
&strvalue);
}
}
@ -627,7 +627,7 @@ static inline void cb_append_property(struct call_barring_data *cb,
snprintf(property_name, sizeof(property_name), "%s%s",
bearer_class_to_string(cls), property);
dbus_gsm_dict_append(dict, property_name, DBUS_TYPE_STRING,
ofono_dbus_dict_append(dict, property_name, DBUS_TYPE_STRING,
&value);
}

4
src/call-forwarding.c
View File

@ -336,10 +336,10 @@ static inline void property_append_cf_condition(DBusMessageIter *dict, int cls,
sprintf(tattr, "%s%sTimeout", bearer_class_to_string(cls),
postfix);
dbus_gsm_dict_append(dict, attr, DBUS_TYPE_STRING, &value);
ofono_dbus_dict_append(dict, attr, DBUS_TYPE_STRING, &value);
if (addt)
dbus_gsm_dict_append(dict, tattr, DBUS_TYPE_UINT16, &timeout);
ofono_dbus_dict_append(dict, tattr, DBUS_TYPE_UINT16, &timeout);
}
static void property_append_cf_conditions(DBusMessageIter *dict,

10
src/call-meter.c
View File

@ -181,18 +181,18 @@ static void cm_get_properties_reply(struct ofono_modem *modem)
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
dbus_gsm_dict_append(&dict, "CallMeter", DBUS_TYPE_UINT32,
ofono_dbus_dict_append(&dict, "CallMeter", DBUS_TYPE_UINT32,
&cm->call_meter);
dbus_gsm_dict_append(&dict, "AccumulatedCallMeter", DBUS_TYPE_UINT32,
ofono_dbus_dict_append(&dict, "AccumulatedCallMeter", DBUS_TYPE_UINT32,
&cm->acm);
dbus_gsm_dict_append(&dict, "AccumulatedCallMeterMaximum",
ofono_dbus_dict_append(&dict, "AccumulatedCallMeterMaximum",
DBUS_TYPE_UINT32, &cm->acm_max);
dbus_gsm_dict_append(&dict, "PricePerUnit", DBUS_TYPE_DOUBLE, &cm->ppu);
ofono_dbus_dict_append(&dict, "PricePerUnit", DBUS_TYPE_DOUBLE, &cm->ppu);
dbus_gsm_dict_append(&dict, "Currency", DBUS_TYPE_STRING, &currency);
ofono_dbus_dict_append(&dict, "Currency", DBUS_TYPE_STRING, &currency);
dbus_message_iter_close_container(&iter, &dict);

12
src/call-settings.c
View File

@ -295,7 +295,7 @@ static void property_append_cw_conditions(DBusMessageIter *dict,
else
value = "disabled";
dbus_gsm_dict_append(dict, prop, DBUS_TYPE_STRING, &value);
ofono_dbus_dict_append(dict, prop, DBUS_TYPE_STRING, &value);
}
}
@ -785,23 +785,23 @@ static DBusMessage *generate_get_properties_reply(struct ofono_modem *modem,
&dict);
str = clip_status_to_string(cs->clip);
dbus_gsm_dict_append(&dict, "CallingLinePresentation",
ofono_dbus_dict_append(&dict, "CallingLinePresentation",
DBUS_TYPE_STRING, &str);
str = colp_status_to_string(cs->colp);
dbus_gsm_dict_append(&dict, "CalledLinePresentation",
ofono_dbus_dict_append(&dict, "CalledLinePresentation",
DBUS_TYPE_STRING, &str);
str = colr_status_to_string(cs->colr);
dbus_gsm_dict_append(&dict, "CalledLineRestriction",
ofono_dbus_dict_append(&dict, "CalledLineRestriction",
DBUS_TYPE_STRING, &str);
str = clir_status_to_string(cs->clir);
dbus_gsm_dict_append(&dict, "CallingLineRestriction",
ofono_dbus_dict_append(&dict, "CallingLineRestriction",
DBUS_TYPE_STRING, &str);
str = hide_callerid_to_string(cs->clir_setting);
dbus_gsm_dict_append(&dict, "HideCallerId", DBUS_TYPE_STRING, &str);
ofono_dbus_dict_append(&dict, "HideCallerId", DBUS_TYPE_STRING, &str);
property_append_cw_conditions(&dict, cs->cw, BEARER_CLASS_VOICE);

2
src/dbus-gsm.c
View File

@ -52,7 +52,7 @@ void dbus_gsm_append_variant(DBusMessageIter *iter,
dbus_message_iter_close_container(iter, &valueiter);
}
void dbus_gsm_dict_append(DBusMessageIter *dict,
void ofono_dbus_dict_append(DBusMessageIter *dict,
const char *key, int type, void *value)
{
DBusMessageIter keyiter;

3
src/dbus-gsm.h
View File

@ -24,9 +24,6 @@
#define MAX_DBUS_PATH_LEN 64
void dbus_gsm_dict_append(DBusMessageIter *dict, const char *key, int type,
void *value);
void dbus_gsm_append_variant(DBusMessageIter *iter, int type, void *value);
void dbus_gsm_append_array_variant(DBusMessageIter *iter, int type, void *val);

8
src/modem.c
View File

@ -147,19 +147,19 @@ static DBusMessage *generate_properties_reply(struct ofono_modem *modem,
&dict);
if (info->manufacturer)
dbus_gsm_dict_append(&dict, "Manufacturer", DBUS_TYPE_STRING,
ofono_dbus_dict_append(&dict, "Manufacturer", DBUS_TYPE_STRING,
&info->manufacturer);
if (info->model)
dbus_gsm_dict_append(&dict, "Model", DBUS_TYPE_STRING,
ofono_dbus_dict_append(&dict, "Model", DBUS_TYPE_STRING,
&info->model);
if (info->revision)
dbus_gsm_dict_append(&dict, "Revision", DBUS_TYPE_STRING,
ofono_dbus_dict_append(&dict, "Revision", DBUS_TYPE_STRING,
&info->revision);
if (info->serial)
dbus_gsm_dict_append(&dict, "Serial", DBUS_TYPE_STRING,
ofono_dbus_dict_append(&dict, "Serial", DBUS_TYPE_STRING,
&info->serial);
interfaces = g_new0(char *, g_slist_length(info->interface_list) + 1);

28
src/network.c
View File

@ -512,19 +512,19 @@ static DBusMessage *network_operator_get_properties(DBusConnection *conn,
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
dbus_gsm_dict_append(&dict, "Name", DBUS_TYPE_STRING, &name);
ofono_dbus_dict_append(&dict, "Name", DBUS_TYPE_STRING, &name);
dbus_gsm_dict_append(&dict, "Status", DBUS_TYPE_STRING, &status);
ofono_dbus_dict_append(&dict, "Status", DBUS_TYPE_STRING, &status);
if (*opd->info->mcc != '\0') {
const char *mcc = opd->info->mcc;
dbus_gsm_dict_append(&dict, "MobileCountryCode",
ofono_dbus_dict_append(&dict, "MobileCountryCode",
DBUS_TYPE_STRING, &mcc);
}
if (*opd->info->mnc != '\0') {
const char *mnc = opd->info->mnc;
dbus_gsm_dict_append(&dict, "MobileNetworkCode",
ofono_dbus_dict_append(&dict, "MobileNetworkCode",
DBUS_TYPE_STRING, &mnc);
}
@ -532,14 +532,14 @@ static DBusMessage *network_operator_get_properties(DBusConnection *conn,
const char *technology =
registration_tech_to_string(opd->info->tech);
dbus_gsm_dict_append(&dict, "Technology", DBUS_TYPE_STRING,
ofono_dbus_dict_append(&dict, "Technology", DBUS_TYPE_STRING,
&technology);
}
if (opd->eons_info && opd->eons_info->info) {
const char *additional = opd->eons_info->info;
dbus_gsm_dict_append(&dict, "AdditionalInformation",
ofono_dbus_dict_append(&dict, "AdditionalInformation",
DBUS_TYPE_STRING, &additional);
}
@ -702,20 +702,20 @@ static DBusMessage *network_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, "Status", DBUS_TYPE_STRING, &status);
ofono_dbus_dict_append(&dict, "Status", DBUS_TYPE_STRING, &status);
if (netreg->location != -1) {
dbus_uint16_t location = netreg->location;
dbus_gsm_dict_append(&dict, "LocationAreaCode",
ofono_dbus_dict_append(&dict, "LocationAreaCode",
DBUS_TYPE_UINT16, &location);
}
if (netreg->cellid != -1) {
dbus_uint32_t cellid = netreg->cellid;
dbus_gsm_dict_append(&dict, "CellId",
ofono_dbus_dict_append(&dict, "CellId",
DBUS_TYPE_UINT32, &cellid);
}
@ -723,12 +723,12 @@ static DBusMessage *network_get_properties(DBusConnection *conn,
const char *technology =
registration_tech_to_string(netreg->technology);
dbus_gsm_dict_append(&dict, "Technology", DBUS_TYPE_STRING,
ofono_dbus_dict_append(&dict, "Technology", DBUS_TYPE_STRING,
&technology);
}
operator = get_operator_display_name(modem);
dbus_gsm_dict_append(&dict, "Operator", DBUS_TYPE_STRING, &operator);
ofono_dbus_dict_append(&dict, "Operator", DBUS_TYPE_STRING, &operator);
network_operator_populate_registered(modem, &network_operators);
@ -740,7 +740,7 @@ static DBusMessage *network_get_properties(DBusConnection *conn,
if (netreg->signal_strength != -1) {
dbus_uint16_t strength = netreg->signal_strength;
dbus_gsm_dict_append(&dict, "Strength", DBUS_TYPE_UINT16,
ofono_dbus_dict_append(&dict, "Strength", DBUS_TYPE_UINT16,
&strength);
}

2
src/sim.c
View File

@ -149,7 +149,7 @@ static DBusMessage *sim_get_properties(DBusConnection *conn,
&dict);
if (sim->imsi)
dbus_gsm_dict_append(&dict, "SubscriberIdentity",
ofono_dbus_dict_append(&dict, "SubscriberIdentity",
DBUS_TYPE_STRING, &sim->imsi);
own_numbers = get_own_numbers(sim->own_numbers);

8
src/sms.c
View File

@ -144,7 +144,7 @@ static DBusMessage *generate_get_properties_reply(struct ofono_modem *modem,
sca = phone_number_to_string(&sms->sca);
dbus_gsm_dict_append(&dict, "ServiceCenterAddress", DBUS_TYPE_STRING,
ofono_dbus_dict_append(&dict, "ServiceCenterAddress", DBUS_TYPE_STRING,
&sca);
dbus_message_iter_close_container(&iter, &dict);
@ -506,14 +506,14 @@ static void dispatch_text_message(struct ofono_modem *modem,
strftime(buf, 127, "%a, %d %b %Y %H:%M:%S %z", localtime(&ts));
buf[127] = '\0';
dbus_gsm_dict_append(&dict, "LocalSentTime", DBUS_TYPE_STRING, &str);
ofono_dbus_dict_append(&dict, "LocalSentTime", DBUS_TYPE_STRING, &str);
strftime(buf, 127, "%a, %d %b %Y %H:%M:%S %z", &remote);
buf[127] = '\0';
dbus_gsm_dict_append(&dict, "SentTime", DBUS_TYPE_STRING, &str);
ofono_dbus_dict_append(&dict, "SentTime", DBUS_TYPE_STRING, &str);
str = sms_address_to_string(addr);
dbus_gsm_dict_append(&dict, "Sender", DBUS_TYPE_STRING, &str);
ofono_dbus_dict_append(&dict, "Sender", DBUS_TYPE_STRING, &str);
dbus_message_iter_close_container(&iter, &dict);

6
src/voicecall.c
View File

@ -168,9 +168,9 @@ static DBusMessage *voicecall_get_properties(DBusConnection *conn,
OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict);
dbus_gsm_dict_append(&dict, "State", DBUS_TYPE_STRING, &status);
ofono_dbus_dict_append(&dict, "State", DBUS_TYPE_STRING, &status);
dbus_gsm_dict_append(&dict, "LineIdentification",
ofono_dbus_dict_append(&dict, "LineIdentification",
DBUS_TYPE_STRING, &callerid);
if (call->status == CALL_STATUS_ACTIVE ||
@ -178,7 +178,7 @@ static DBusMessage *voicecall_get_properties(DBusConnection *conn,
call->status == CALL_STATUS_HELD) {
timestr = time_to_str(&v->start_time);
dbus_gsm_dict_append(&dict, "StartTime", DBUS_TYPE_STRING,
ofono_dbus_dict_append(&dict, "StartTime", DBUS_TYPE_STRING,
&timestr);
}