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

voicecall: Fix some minor style issues for voicecall properties

This commit is contained in:
Marcel Holtmann 2011-01-21 11:25:50 +01:00
parent 9dce507c58
commit 35aa581a0d
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/voicecall.c
View File

@ -357,27 +357,28 @@ static void append_voicecall_properties(struct voicecall *v,
status = call_status_to_string(call->status);
ofono_dbus_dict_append(dict, "State", DBUS_TYPE_STRING, &status);
if (call->direction == CALL_DIRECTION_MOBILE_TERMINATED)
callerid = phone_and_clip_to_string(&call->phone_number,
call->clip_validity);
else
callerid = phone_number_to_string(&call->phone_number);
name = cnap_to_string(call->name, call->cnap_validity);
ofono_dbus_dict_append(dict, "State", DBUS_TYPE_STRING, &status);
ofono_dbus_dict_append(dict, "LineIdentification",
DBUS_TYPE_STRING, &callerid);
DBUS_TYPE_STRING, &callerid);
if (call->called_number.number[0] != '\0') {
const char *calledid;
calledid = phone_number_to_string(&call->called_number);
ofono_dbus_dict_append(dict, "IncomingLine",
DBUS_TYPE_STRING, &calledid);
}
name = cnap_to_string(call->name, call->cnap_validity);
ofono_dbus_dict_append(dict, "Name", DBUS_TYPE_STRING, &name);
if (call->status == CALL_STATUS_ACTIVE ||
@ -391,8 +392,7 @@ static void append_voicecall_properties(struct voicecall *v,
}
if (g_slist_find_custom(v->vc->multiparty_list,
GINT_TO_POINTER(call->id),
call_compare_by_id))
GINT_TO_POINTER(call->id), call_compare_by_id))
mpty = TRUE;
else
mpty = FALSE;
@ -400,20 +400,20 @@ static void append_voicecall_properties(struct voicecall *v,
ofono_dbus_dict_append(dict, "Multiparty", DBUS_TYPE_BOOLEAN, &mpty);
if (v->message)
ofono_dbus_dict_append(dict, "Information", DBUS_TYPE_STRING,
&v->message);
ofono_dbus_dict_append(dict, "Information",
DBUS_TYPE_STRING, &v->message);
if (v->icon_id)
ofono_dbus_dict_append(dict, "Icon", DBUS_TYPE_BYTE,
&v->icon_id);
ofono_dbus_dict_append(dict, "Icon",
DBUS_TYPE_BYTE, &v->icon_id);
if (voicecall_is_emergency(v) == TRUE)
emergency_call = TRUE;
else
emergency_call = FALSE;
ofono_dbus_dict_append(dict, "Emergency", DBUS_TYPE_BOOLEAN,
&emergency_call);
ofono_dbus_dict_append(dict, "Emergency",
DBUS_TYPE_BOOLEAN, &emergency_call);
}