Rename stk_icon_identifier to stk_icon_id

diff --git a/src/stkutil.c b/src/stkutil.c
index 4c9cb6a..b830291 100644 (file)
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -729,7 +729,7 @@ static gboolean parse_dataobj_call_control_requested_action(
 static gboolean parse_dataobj_icon_id(struct comprehension_tlv_iter *iter,
                                        void *user)
 {
-       struct stk_icon_identifier *id = user;
+       struct stk_icon_id *id = user;
        const unsigned char *data;
 
        if (comprehension_tlv_iter_get_length(iter) != 2)

diff --git a/src/stkutil.h b/src/stkutil.h
index 3f2802e..4ff8c4b 100644 (file)
--- a/src/stkutil.h
+++ b/src/stkutil.h
@@ -442,7 +442,7 @@ struct stk_transaction_id {
  * Icon ID denotes a file on the SIM filesystem.  Since EF cannot have record
  * ids of 0, we use icon_id with 0 to denote empty icon_identifier objects
  */
-struct stk_icon_identifier {
+struct stk_icon_id {
        unsigned char qualifier;
        unsigned char id;
 };
@@ -471,7 +471,7 @@ struct stk_text_attribute {
 
 struct stk_command_display_text {
        char *text;
-       struct stk_icon_identifier icon_id;
+       struct stk_icon_id icon_id;
        ofono_bool_t immediate_response;
        struct stk_duration duration;
        struct stk_text_attribute text_attribute;
@@ -482,7 +482,7 @@ struct stk_command_get_input {
        char *text;
        struct stk_response_length response_length;
        char *default_text;
-       struct stk_icon_identifier icon_id;
+       struct stk_icon_id icon_id;
        struct stk_text_attribute text_attribute;
        unsigned char frame_id; /* Values 0x10 to 0xFF reserved */
 };
@@ -491,7 +491,7 @@ struct stk_command_send_sms {
        char *alpha_id;
        struct stk_address address;
        struct sms gsm_sms;
-       struct stk_icon_identifier icon_id;
+       struct stk_icon_id icon_id;
        struct stk_text_attribute text_attribute;
        unsigned char frame_id; /* Values 0x10 to 0xFF reserved */
 };