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

iface-modem-messaging: use defaults when no specific storage specified

Browse Source
This commit is contained in:
Aleksander Morgado
2012-02-10 16:34:40 +01:00
parent 9e3f66393f
commit f7c41b8e48
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

@@ -345,6 +345,9 @@ mm_iface_modem_messaging_set_preferred_storages (MMIfaceModemMessaging *self,
{ {
GError *error = NULL; GError *error = NULL;
StorageContext *ctx; StorageContext *ctx;
MMSmsStorage default_mem1;
MMSmsStorage default_mem2;
MMSmsStorage default_mem3;
if (!MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_preferred_storages || if (!MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_preferred_storages ||
!MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_preferred_storages_finish) { !MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_preferred_storages_finish) {
@@ -369,6 +372,23 @@ mm_iface_modem_messaging_set_preferred_storages (MMIfaceModemMessaging *self,
return; return;
} }
default_mem1 = MM_SMS_STORAGE_UNKNOWN;
default_mem2 = MM_SMS_STORAGE_UNKNOWN;
default_mem3 = MM_SMS_STORAGE_UNKNOWN;
g_object_get (self,
MM_IFACE_MODEM_MESSAGING_SMS_MEM1_STORAGE, &default_mem1,
MM_IFACE_MODEM_MESSAGING_SMS_MEM2_STORAGE, &default_mem2,
MM_IFACE_MODEM_MESSAGING_SMS_MEM3_STORAGE, &default_mem3,
NULL);
/* If unknown given, set defaults */
if (mem1 == MM_SMS_STORAGE_UNKNOWN)
mem1 = default_mem1;
if (mem2 == MM_SMS_STORAGE_UNKNOWN)
mem2 = default_mem2;
if (mem3 == MM_SMS_STORAGE_UNKNOWN)
mem3 = default_mem3;
MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_preferred_storages ( MM_IFACE_MODEM_MESSAGING_GET_INTERFACE (self)->set_preferred_storages (
self, mem1, mem2, mem3, callback, user_data); self, mem1, mem2, mem3, callback, user_data);
} }