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.
This commit is contained in:
Aleksander Morgado
2012-03-16 14:53:19 +01:00
parent 3ccc78e858
commit ef9fb0bfac
13 changed files with 185 additions and 301 deletions
+2 -2
View File
@@ -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);
+9 -9
View File
@@ -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,
+1 -1
View File
@@ -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,