diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2013-04-03 16:30:48 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-04-05 17:48:51 +0200 |
| commit | f9105bff875ae0e7263718a317e156948957a6d0 (patch) | |
| tree | 417299f51a7d17d7d5bd30692fd7b5ffd98092de /src/mm-sms-part.c | |
| parent | 372a49bbf661c95110852c86df54008a7bad2774 (diff) | |
api,introspection: update 'Validity' property in the SMS interface
We don't want to support only 'relative' validity, so don't assume that the
Validity property will always be a uint32 value.
Instead, we define the Validity propery as '(uv)' tuple, where the first value
(a MMSmsValidityType) specifies the type of validity, and the second value is
a variant formatted accordingly to what the validity type specifies (e.g. a
uint32 value if the type is MM_SMS_VALIDITY_TYPE_RELATIVE).
Diffstat (limited to 'src/mm-sms-part.c')
| -rw-r--r-- | src/mm-sms-part.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mm-sms-part.c b/src/mm-sms-part.c index ffe15a99..e68a25b6 100644 --- a/src/mm-sms-part.c +++ b/src/mm-sms-part.c @@ -326,7 +326,7 @@ struct _MMSmsPart { MMSmsEncoding encoding; GByteArray *data; guint class; - guint validity; + guint validity_relative; gboolean delivery_report_request; guint message_reference; /* NOT a MMSmsDeliveryState, which just includes the known values */ @@ -405,8 +405,8 @@ PART_GET_FUNC (MMSmsEncoding, encoding) PART_SET_FUNC (MMSmsEncoding, encoding) PART_GET_FUNC (guint, class) PART_SET_FUNC (guint, class) -PART_GET_FUNC (guint, validity) -PART_SET_FUNC (guint, validity) +PART_GET_FUNC (guint, validity_relative) +PART_SET_FUNC (guint, validity_relative) PART_GET_FUNC (gboolean, delivery_report_request) PART_SET_FUNC (gboolean, delivery_report_request) PART_GET_FUNC (guint, message_reference) @@ -655,8 +655,8 @@ mm_sms_part_new_from_binary_pdu (guint index, switch (validity_format) { case 0x10: mm_dbg (" validity available, format relative"); - mm_sms_part_set_validity (sms_part, - relative_to_validity (pdu[offset])); + mm_sms_part_set_validity_relative (sms_part, + relative_to_validity (pdu[offset])); offset++; break; case 0x08: @@ -972,7 +972,7 @@ mm_sms_part_get_submit_pdu (MMSmsPart *part, pdu[offset] = 0; /* TP-VP present; format RELATIVE */ - if (part->validity > 0) { + if (part->validity_relative > 0) { mm_dbg (" adding validity to PDU..."); pdu[offset] |= 0x10; } @@ -1034,8 +1034,8 @@ mm_sms_part_get_submit_pdu (MMSmsPart *part, /* ----------- TP-Validity-Period (1 byte): 4 days ----------- */ /* Only if TP-VPF was set in first byte */ - if (part->validity > 0) - pdu[offset++] = validity_to_relative (part->validity); + if (part->validity_relative > 0) + pdu[offset++] = validity_to_relative (part->validity_relative); /* ----------- TP-User-Data-Length ----------- */ /* Set to zero initially, and keep a ptr for easy access later */ |