colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sms: pass known state when creating the MMSms object

Browse Source
This commit is contained in:
Aleksander Morgado
2012-02-07 23:11:06 +01:00
parent c17d6c09a4
commit c15fbedc03
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mm-sms-list.c
View File

@@ -188,7 +188,9 @@ take_singlepart (MMSmsList *self,
GError *error = NULL; GError *error = NULL;
sms = mm_sms_singlepart_new (self->priv->modem, sms = mm_sms_singlepart_new (self->priv->modem,
received, (received ?
MM_MODEM_SMS_STATE_RECEIVED :
MM_MODEM_SMS_STATE_STORED),
part, part,
&error); &error);
@@ -225,7 +227,9 @@ take_multipart (MMSmsList *self,
} else { } else {
/* Create new Multipart */ /* Create new Multipart */
sms = mm_sms_multipart_new (self->priv->modem, sms = mm_sms_multipart_new (self->priv->modem,
received, (received ?
MM_MODEM_SMS_STATE_RECEIVED :
MM_MODEM_SMS_STATE_STORED),
concat_reference, concat_reference,
mm_sms_part_get_concat_max (part), mm_sms_part_get_concat_max (part),
part, part,

14
src/mm-sms.c
View File

@@ -455,7 +455,7 @@ mm_sms_new (MMBaseModem *modem)
MMSms * MMSms *
mm_sms_singlepart_new (MMBaseModem *modem, mm_sms_singlepart_new (MMBaseModem *modem,
gboolean received, MMModemSmsState state,
MMSmsPart *part, MMSmsPart *part,
GError **error) GError **error)
{ {
@@ -463,9 +463,7 @@ mm_sms_singlepart_new (MMBaseModem *modem,
self = mm_sms_new (modem); self = mm_sms_new (modem);
g_object_set (self, g_object_set (self,
"state", (received ? "state", state,
MM_MODEM_SMS_STATE_RECEIVED :
MM_MODEM_SMS_STATE_STORED),
NULL); NULL);
/* Keep the single part in the list */ /* Keep the single part in the list */
@@ -482,7 +480,7 @@ mm_sms_singlepart_new (MMBaseModem *modem,
MMSms * MMSms *
mm_sms_multipart_new (MMBaseModem *modem, mm_sms_multipart_new (MMBaseModem *modem,
gboolean received, MMModemSmsState state,
guint reference, guint reference,
guint max_parts, guint max_parts,
MMSmsPart *first_part, MMSmsPart *first_part,
@@ -495,9 +493,7 @@ mm_sms_multipart_new (MMBaseModem *modem,
MM_SMS_IS_MULTIPART, TRUE, MM_SMS_IS_MULTIPART, TRUE,
MM_SMS_MAX_PARTS, max_parts, MM_SMS_MAX_PARTS, max_parts,
MM_SMS_MULTIPART_REFERENCE, reference, MM_SMS_MULTIPART_REFERENCE, reference,
"state", (received ? "state", state,
MM_MODEM_SMS_STATE_RECEIVED :
MM_MODEM_SMS_STATE_STORED),
NULL); NULL);
if (!mm_sms_multipart_take_part (self, first_part, error)) 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); mm_sms_part_set_class (part, class);
return mm_sms_singlepart_new (modem, return mm_sms_singlepart_new (modem,
FALSE, MM_MODEM_SMS_STATE_UNKNOWN,
part, part,
error); error);
} }

4
src/mm-sms.h
View File

@@ -75,12 +75,12 @@ MMSms *mm_sms_user_new (MMBaseModem *modem,
GError **error); GError **error);
MMSms *mm_sms_singlepart_new (MMBaseModem *modem, MMSms *mm_sms_singlepart_new (MMBaseModem *modem,
gboolean received, MMModemSmsState state,
MMSmsPart *part, MMSmsPart *part,
GError **error); GError **error);
MMSms *mm_sms_multipart_new (MMBaseModem *modem, MMSms *mm_sms_multipart_new (MMBaseModem *modem,
gboolean received, MMModemSmsState state,
guint reference, guint reference,
guint max_parts, guint max_parts,
MMSmsPart *first_part, MMSmsPart *first_part,