From ef5aae51254cd2336f09c87e84dfa9f496fc88dc Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 14 Aug 2013 18:01:53 +0200 Subject: iface-modem-messaging: never add UNKNOWN to the lists of supported storages --- src/mm-iface-modem-messaging.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/mm-iface-modem-messaging.c') diff --git a/src/mm-iface-modem-messaging.c b/src/mm-iface-modem-messaging.c index 143d7ef9..874397e5 100644 --- a/src/mm-iface-modem-messaging.c +++ b/src/mm-iface-modem-messaging.c @@ -1078,6 +1078,21 @@ initialization_context_complete_and_free_if_cancelled (InitializationContext *ct return TRUE; } +static void +skip_unknown_storages (GArray *mem) +{ + guint i = mem->len; + + if (!mem) + return; + + /* Remove UNKNOWN from the list of supported storages */ + while (i-- > 0) { + if (g_array_index (mem, MMSmsStorage, i) == MM_SMS_STORAGE_UNKNOWN) + g_array_remove_index (mem, i); + } +} + static void load_supported_storages_ready (MMIfaceModemMessaging *self, GAsyncResult *res, @@ -1103,6 +1118,11 @@ load_supported_storages_ready (MMIfaceModemMessaging *self, GArray *supported_storages; guint i; + /* Never add unknown storages */ + skip_unknown_storages (storage_ctx->supported_mem1); + skip_unknown_storages (storage_ctx->supported_mem2); + skip_unknown_storages (storage_ctx->supported_mem3); + mem1 = mm_common_build_sms_storages_string ((MMSmsStorage *)storage_ctx->supported_mem1->data, storage_ctx->supported_mem1->len); mem2 = mm_common_build_sms_storages_string ((MMSmsStorage *)storage_ctx->supported_mem2->data, -- cgit v1.2.3-70-g09d2