aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2012-09-07 13:56:45 +0200
committerAleksander Morgado <aleksander@lanedo.com>2012-09-14 07:05:22 +0200
commitcb0ce9c6ca13fafb0c86182aa2924f296cfeb48b (patch)
treef79a132e1dcb73f8c7bef4c34ed02c7752ac93ee
parentc2b246414cb7d4bbd6782b7879fa66a7d627177a (diff)
sms: either 'text' or 'data' is mandatory
-rw-r--r--src/mm-sms.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mm-sms.c b/src/mm-sms.c
index f29529b3..022e662b 100644
--- a/src/mm-sms.c
+++ b/src/mm-sms.c
@@ -1222,14 +1222,15 @@ mm_sms_new_from_properties (MMBaseModem *modem,
MMSmsPart *part;
/* Don't create SMS from properties if either text or number is missing */
- if (!mm_sms_properties_get_text (properties) ||
- !mm_sms_properties_get_number (properties)) {
+ if (!mm_sms_properties_get_number (properties) ||
+ (!mm_sms_properties_get_text (properties) &&
+ !mm_sms_properties_get_data (properties, NULL))) {
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_INVALID_ARGS,
"Cannot create SMS: mandatory parameter '%s' is missing",
- (mm_sms_properties_get_text (properties) == NULL ?
- "text" : "number"));
+ (!mm_sms_properties_get_number (properties)?
+ "number" : "text' or 'data"));
}
part = mm_sms_part_new (SMS_PART_INVALID_INDEX);