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

Support Default Text data objects

This commit is contained in:
Denis Kenzior 2010-03-01 17:57:56 -06:00
parent 2c1cdebd1a
commit 700a0ece69
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/stkutil.c
View File

@ -97,9 +97,12 @@ static gboolean parse_dataobj_text(struct comprehension_tlv_iter *iter,
{ {
char **text = user; char **text = user;
unsigned int len; unsigned int len;
enum stk_data_object_type tag;
if (comprehension_tlv_iter_get_tag(iter) != tag = comprehension_tlv_iter_get_tag(iter);
STK_DATA_OBJECT_TYPE_TEXT)
if (tag != STK_DATA_OBJECT_TYPE_TEXT &&
tag != STK_DATA_OBJECT_TYPE_DEFAULT_TEXT)
return FALSE; return FALSE;
len = comprehension_tlv_iter_get_length(iter); len = comprehension_tlv_iter_get_length(iter);
@ -148,8 +151,12 @@ static gboolean parse_dataobj_text(struct comprehension_tlv_iter *iter,
return FALSE; return FALSE;
*text = utf8; *text = utf8;
} else } else {
if (tag == STK_DATA_OBJECT_TYPE_DEFAULT_TEXT)
return FALSE;
*text = NULL; *text = NULL;
}
return TRUE; return TRUE;
} }
@ -252,6 +259,7 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type)
case STK_DATA_OBJECT_TYPE_RESPONSE_LENGTH: case STK_DATA_OBJECT_TYPE_RESPONSE_LENGTH:
return parse_dataobj_response_len; return parse_dataobj_response_len;
case STK_DATA_OBJECT_TYPE_TEXT: case STK_DATA_OBJECT_TYPE_TEXT:
case STK_DATA_OBJECT_TYPE_DEFAULT_TEXT:
return parse_dataobj_text; return parse_dataobj_text;
case STK_DATA_OBJECT_TYPE_ICON_ID: case STK_DATA_OBJECT_TYPE_ICON_ID:
return parse_dataobj_icon_id; return parse_dataobj_icon_id;