diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-02-07 23:11:06 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-15 14:15:01 +0100 |
| commit | c15fbedc03569723b26b39706d93bace50e1ada0 (patch) | |
| tree | 41aa7be968d6961e2dbbc33b230e6ba71c3bc6c5 /src | |
| parent | c17d6c09a4595663e87ad80202bd6add75254fb4 (diff) | |
sms: pass known state when creating the MMSms object
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-sms-list.c | 8 | ||||
| -rw-r--r-- | src/mm-sms.c | 14 | ||||
| -rw-r--r-- | src/mm-sms.h | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/mm-sms-list.c b/src/mm-sms-list.c index f2ee8c9c..b071176f 100644 --- a/src/mm-sms-list.c +++ b/src/mm-sms-list.c @@ -188,7 +188,9 @@ take_singlepart (MMSmsList *self, GError *error = NULL; sms = mm_sms_singlepart_new (self->priv->modem, - received, + (received ? + MM_MODEM_SMS_STATE_RECEIVED : + MM_MODEM_SMS_STATE_STORED), part, &error); @@ -225,7 +227,9 @@ take_multipart (MMSmsList *self, } else { /* Create new Multipart */ sms = mm_sms_multipart_new (self->priv->modem, - received, + (received ? + MM_MODEM_SMS_STATE_RECEIVED : + MM_MODEM_SMS_STATE_STORED), concat_reference, mm_sms_part_get_concat_max (part), part, diff --git a/src/mm-sms.c b/src/mm-sms.c index afc7067c..492043d9 100644 --- a/src/mm-sms.c +++ b/src/mm-sms.c @@ -455,7 +455,7 @@ mm_sms_new (MMBaseModem *modem) MMSms * mm_sms_singlepart_new (MMBaseModem *modem, - gboolean received, + MMModemSmsState state, MMSmsPart *part, GError **error) { @@ -463,9 +463,7 @@ mm_sms_singlepart_new (MMBaseModem *modem, self = mm_sms_new (modem); g_object_set (self, - "state", (received ? - MM_MODEM_SMS_STATE_RECEIVED : - MM_MODEM_SMS_STATE_STORED), + "state", state, NULL); /* Keep the single part in the list */ @@ -482,7 +480,7 @@ mm_sms_singlepart_new (MMBaseModem *modem, MMSms * mm_sms_multipart_new (MMBaseModem *modem, - gboolean received, + MMModemSmsState state, guint reference, guint max_parts, MMSmsPart *first_part, @@ -495,9 +493,7 @@ mm_sms_multipart_new (MMBaseModem *modem, MM_SMS_IS_MULTIPART, TRUE, MM_SMS_MAX_PARTS, max_parts, MM_SMS_MULTIPART_REFERENCE, reference, - "state", (received ? - MM_MODEM_SMS_STATE_RECEIVED : - MM_MODEM_SMS_STATE_STORED), + "state", state, NULL); if (!mm_sms_multipart_take_part (self, first_part, error)) @@ -525,7 +521,7 @@ mm_sms_user_new (MMBaseModem *modem, mm_sms_part_set_class (part, class); return mm_sms_singlepart_new (modem, - FALSE, + MM_MODEM_SMS_STATE_UNKNOWN, part, error); } diff --git a/src/mm-sms.h b/src/mm-sms.h index 6136a1af..29494830 100644 --- a/src/mm-sms.h +++ b/src/mm-sms.h @@ -75,12 +75,12 @@ MMSms *mm_sms_user_new (MMBaseModem *modem, GError **error); MMSms *mm_sms_singlepart_new (MMBaseModem *modem, - gboolean received, + MMModemSmsState state, MMSmsPart *part, GError **error); MMSms *mm_sms_multipart_new (MMBaseModem *modem, - gboolean received, + MMModemSmsState state, guint reference, guint max_parts, MMSmsPart *first_part, |