api,header: renamed MMModemSmsState' to MMSmsState'

docs/reference/api/mm-sections.txt

@@ -16,9 +16,9 @@ MMModemContactsStorage
 MMModemLocationSource
 MMModemLock
 MMModemMode
-MMModemSmsState
 MMModemState
 MMModemStateChangeReason
+MMSmsState
 </SECTION>
 
 <SECTION>

include/ModemManager-enums.h

@@ -280,24 +280,24 @@ typedef enum { /*< underscore_name=mm_modem_band >*/
 } MMModemBand;
 
 /**
- * MMModemSmsState:
+ * MMSmsState:
- * @MM_MODEM_SMS_STATE_UNKNOWN: State unknown or not reportable.
+ * @MM_SMS_STATE_UNKNOWN: State unknown or not reportable.
- * @MM_MODEM_SMS_STATE_STORED: The message has been neither received nor yet sent.
+ * @MM_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_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_SMS_STATE_RECEIVED: The message has been completely received.
- * @MM_MODEM_SMS_STATE_SENDING: The message is queued for delivery.
+ * @MM_SMS_STATE_SENDING: The message is queued for delivery.
- * @MM_MODEM_SMS_STATE_SENT: The message was successfully sent.
+ * @MM_SMS_STATE_SENT: The message was successfully sent.
  *
  * State of a given SMS.
  */
-typedef enum { /*< underscore_name=mm_modem_sms_state >*/
+typedef enum { /*< underscore_name=mm_sms_state >*/
-    MM_MODEM_SMS_STATE_UNKNOWN   = 0,
+    MM_SMS_STATE_UNKNOWN   = 0,
-    MM_MODEM_SMS_STATE_STORED    = 1,
+    MM_SMS_STATE_STORED    = 1,
-    MM_MODEM_SMS_STATE_RECEIVING = 2,
+    MM_SMS_STATE_RECEIVING = 2,
-    MM_MODEM_SMS_STATE_RECEIVED  = 3,
+    MM_SMS_STATE_RECEIVED  = 3,
-    MM_MODEM_SMS_STATE_SENDING   = 4,
+    MM_SMS_STATE_SENDING   = 4,
-    MM_MODEM_SMS_STATE_SENT      = 5,
+    MM_SMS_STATE_SENT      = 5,
-} MMModemSmsState;
+} MMSmsState;
 
 /**
  * MMModemLocationSource:

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" />

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_SMS_STATE_RECEIVED :
-                                  MM_MODEM_SMS_STATE_STORED),
+                                  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_SMS_STATE_RECEIVED :
-                                     MM_MODEM_SMS_STATE_STORED),
+                                     MM_SMS_STATE_STORED),
                                     concat_reference,
                                     mm_sms_part_get_concat_max (part),
                                     part,

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);
 }

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,