diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-01 11:11:28 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-16 14:53:19 +0100 |
| commit | ef9fb0bfacac348c5bab35a3a99d52270e510d99 (patch) | |
| tree | 770ed4088a84a885b53412bd4b970371b7e2f394 /src | |
| parent | 3ccc78e8588acec9632863d30e310cdc76ad8598 (diff) | |
libmm-common: `MMSmsProperties' won't be considered internal any more
Renamed `MMCommonSmsProperties' to `MMSmsProperties', and removed the
`MMSmsProperties' provided in libmm-glib. We'll just use the original one
from libmm-common always.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-iface-modem-messaging.c | 4 | ||||
| -rw-r--r-- | src/mm-sms.c | 18 | ||||
| -rw-r--r-- | src/mm-sms.h | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/mm-iface-modem-messaging.c b/src/mm-iface-modem-messaging.c index d450d61e..6a30bd60 100644 --- a/src/mm-iface-modem-messaging.c +++ b/src/mm-iface-modem-messaging.c @@ -204,7 +204,7 @@ handle_create_auth_ready (MMBaseModem *self, MMModemState modem_state = MM_MODEM_STATE_UNKNOWN; MMSmsList *list = NULL; GError *error = NULL; - MMCommonSmsProperties *properties; + MMSmsProperties *properties; MMSms *sms; if (!mm_base_modem_authorize_finish (self, res, &error)) { @@ -227,7 +227,7 @@ handle_create_auth_ready (MMBaseModem *self, } /* Parse input properties */ - properties = mm_common_sms_properties_new_from_dictionary (ctx->dictionary, &error); + properties = mm_sms_properties_new_from_dictionary (ctx->dictionary, &error); if (!properties) { g_dbus_method_invocation_take_error (ctx->invocation, error); handle_create_context_free (ctx); diff --git a/src/mm-sms.c b/src/mm-sms.c index 4848a0a3..11399f18 100644 --- a/src/mm-sms.c +++ b/src/mm-sms.c @@ -1077,28 +1077,28 @@ mm_sms_multipart_new (MMBaseModem *modem, MMSms * mm_sms_new_from_properties (MMBaseModem *modem, - MMCommonSmsProperties *properties, + MMSmsProperties *properties, GError **error) { MMSmsPart *part; /* Don't create SMS from properties if either text or number is missing */ - if (!mm_common_sms_properties_get_text (properties) || - !mm_common_sms_properties_get_number (properties)) { + if (!mm_sms_properties_get_text (properties) || + !mm_sms_properties_get_number (properties)) { g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_INVALID_ARGS, "Cannot create SMS: mandatory parameter '%s' is missing", - (mm_common_sms_properties_get_text (properties) == NULL ? + (mm_sms_properties_get_text (properties) == NULL ? "text" : "number")); } part = mm_sms_part_new (SMS_PART_INVALID_INDEX); - mm_sms_part_set_text (part, mm_common_sms_properties_get_text (properties)); - mm_sms_part_set_number (part, mm_common_sms_properties_get_number (properties)); - mm_sms_part_set_smsc (part, mm_common_sms_properties_get_smsc (properties)); - mm_sms_part_set_validity (part, mm_common_sms_properties_get_validity (properties)); - mm_sms_part_set_class (part, mm_common_sms_properties_get_class (properties)); + mm_sms_part_set_text (part, mm_sms_properties_get_text (properties)); + mm_sms_part_set_number (part, mm_sms_properties_get_number (properties)); + mm_sms_part_set_smsc (part, mm_sms_properties_get_smsc (properties)); + mm_sms_part_set_validity (part, mm_sms_properties_get_validity (properties)); + mm_sms_part_set_class (part, mm_sms_properties_get_class (properties)); return mm_sms_singlepart_new (modem, MM_SMS_STATE_UNKNOWN, diff --git a/src/mm-sms.h b/src/mm-sms.h index 7f6f731c..df232157 100644 --- a/src/mm-sms.h +++ b/src/mm-sms.h @@ -83,7 +83,7 @@ GType mm_sms_get_type (void); MMSms *mm_sms_new (MMBaseModem *modem); MMSms *mm_sms_new_from_properties (MMBaseModem *modem, - MMCommonSmsProperties *properties, + MMSmsProperties *properties, GError **error); MMSms *mm_sms_singlepart_new (MMBaseModem *modem, |