diff options
| -rw-r--r-- | docs/reference/api/mm-sections.txt | 2 | ||||
| -rw-r--r-- | include/ModemManager-enums.h | 30 | ||||
| -rw-r--r-- | new/org.freedesktop.ModemManager1.Sms.xml | 2 | ||||
| -rw-r--r-- | src/mm-sms-list.c | 8 | ||||
| -rw-r--r-- | src/mm-sms.c | 6 | ||||
| -rw-r--r-- | src/mm-sms.h | 4 |
6 files changed, 26 insertions, 26 deletions
diff --git a/docs/reference/api/mm-sections.txt b/docs/reference/api/mm-sections.txt index 0ca151a4..607e0648 100644 --- a/docs/reference/api/mm-sections.txt +++ b/docs/reference/api/mm-sections.txt @@ -16,9 +16,9 @@ MMModemContactsStorage MMModemLocationSource MMModemLock MMModemMode -MMModemSmsState MMModemState MMModemStateChangeReason +MMSmsState </SECTION> <SECTION> diff --git a/include/ModemManager-enums.h b/include/ModemManager-enums.h index 77deff98..6f7fc7d9 100644 --- a/include/ModemManager-enums.h +++ b/include/ModemManager-enums.h @@ -280,24 +280,24 @@ typedef enum { /*< underscore_name=mm_modem_band >*/ } MMModemBand; /** - * MMModemSmsState: - * @MM_MODEM_SMS_STATE_UNKNOWN: State unknown or not reportable. - * @MM_MODEM_SMS_STATE_STORED: The message has been neither received nor yet sent. - * @MM_MODEM_SMS_STATE_RECEIVING: The message is being received but is not yet complete. - * @MM_MODEM_SMS_STATE_RECEIVED: The message has been completely received. - * @MM_MODEM_SMS_STATE_SENDING: The message is queued for delivery. - * @MM_MODEM_SMS_STATE_SENT: The message was successfully sent. + * MMSmsState: + * @MM_SMS_STATE_UNKNOWN: State unknown or not reportable. + * @MM_SMS_STATE_STORED: The message has been neither received nor yet sent. + * @MM_SMS_STATE_RECEIVING: The message is being received but is not yet complete. + * @MM_SMS_STATE_RECEIVED: The message has been completely received. + * @MM_SMS_STATE_SENDING: The message is queued for delivery. + * @MM_SMS_STATE_SENT: The message was successfully sent. * * State of a given SMS. */ -typedef enum { /*< underscore_name=mm_modem_sms_state >*/ - MM_MODEM_SMS_STATE_UNKNOWN = 0, - MM_MODEM_SMS_STATE_STORED = 1, - MM_MODEM_SMS_STATE_RECEIVING = 2, - MM_MODEM_SMS_STATE_RECEIVED = 3, - MM_MODEM_SMS_STATE_SENDING = 4, - MM_MODEM_SMS_STATE_SENT = 5, -} MMModemSmsState; +typedef enum { /*< underscore_name=mm_sms_state >*/ + MM_SMS_STATE_UNKNOWN = 0, + MM_SMS_STATE_STORED = 1, + MM_SMS_STATE_RECEIVING = 2, + MM_SMS_STATE_RECEIVED = 3, + MM_SMS_STATE_SENDING = 4, + MM_SMS_STATE_SENT = 5, +} MMSmsState; /** * MMModemLocationSource: diff --git a/new/org.freedesktop.ModemManager1.Sms.xml b/new/org.freedesktop.ModemManager1.Sms.xml index cb9e4365..8adf7e6d 100644 --- a/new/org.freedesktop.ModemManager1.Sms.xml +++ b/new/org.freedesktop.ModemManager1.Sms.xml @@ -29,7 +29,7 @@ <!-- State: - A <link linkend="MMModemSmsState">MMModemSmsState</link> value, + A <link linkend="MMSmsState">MMSmsState</link> value, describing the state of the message. --> <property name="State" type="u" access="read" /> diff --git a/src/mm-sms-list.c b/src/mm-sms-list.c index b071176f..a1e6eba6 100644 --- a/src/mm-sms-list.c +++ b/src/mm-sms-list.c @@ -189,8 +189,8 @@ take_singlepart (MMSmsList *self, sms = mm_sms_singlepart_new (self->priv->modem, (received ? - MM_MODEM_SMS_STATE_RECEIVED : - MM_MODEM_SMS_STATE_STORED), + MM_SMS_STATE_RECEIVED : + MM_SMS_STATE_STORED), part, &error); @@ -228,8 +228,8 @@ take_multipart (MMSmsList *self, /* Create new Multipart */ sms = mm_sms_multipart_new (self->priv->modem, (received ? - MM_MODEM_SMS_STATE_RECEIVED : - MM_MODEM_SMS_STATE_STORED), + MM_SMS_STATE_RECEIVED : + MM_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 492043d9..5544b971 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, - MMModemSmsState state, + MMSmsState state, MMSmsPart *part, GError **error) { @@ -480,7 +480,7 @@ mm_sms_singlepart_new (MMBaseModem *modem, MMSms * mm_sms_multipart_new (MMBaseModem *modem, - MMModemSmsState state, + MMSmsState state, guint reference, guint max_parts, MMSmsPart *first_part, @@ -521,7 +521,7 @@ mm_sms_user_new (MMBaseModem *modem, mm_sms_part_set_class (part, class); return mm_sms_singlepart_new (modem, - MM_MODEM_SMS_STATE_UNKNOWN, + MM_SMS_STATE_UNKNOWN, part, error); } diff --git a/src/mm-sms.h b/src/mm-sms.h index 29494830..611ae56f 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, - MMModemSmsState state, + MMSmsState state, MMSmsPart *part, GError **error); MMSms *mm_sms_multipart_new (MMBaseModem *modem, - MMModemSmsState state, + MMSmsState state, guint reference, guint max_parts, MMSmsPart *first_part, |