colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iface-modem-messaging: never add UNKNOWN to the lists of supported storages

Browse Source
This commit is contained in:
Aleksander Morgado
2013-08-14 18:01:53 +02:00
parent b83ef8b5e2
commit ef5aae5125
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mm-iface-modem-messaging.c
View File

@@ -1078,6 +1078,21 @@ initialization_context_complete_and_free_if_cancelled (InitializationContext *ct
return TRUE; 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 static void
load_supported_storages_ready (MMIfaceModemMessaging *self, load_supported_storages_ready (MMIfaceModemMessaging *self,
GAsyncResult *res, GAsyncResult *res,
@@ -1103,6 +1118,11 @@ load_supported_storages_ready (MMIfaceModemMessaging *self,
GArray *supported_storages; GArray *supported_storages;
guint i; 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, mem1 = mm_common_build_sms_storages_string ((MMSmsStorage *)storage_ctx->supported_mem1->data,
storage_ctx->supported_mem1->len); storage_ctx->supported_mem1->len);
mem2 = mm_common_build_sms_storages_string ((MMSmsStorage *)storage_ctx->supported_mem2->data, mem2 = mm_common_build_sms_storages_string ((MMSmsStorage *)storage_ctx->supported_mem2->data,