diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2011-12-31 12:57:10 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-15 14:14:42 +0100 |
| commit | f4acff17daf158071e9a0e965e80131dfc91b2c5 (patch) | |
| tree | 7042f08dfba8ea1cafefa9d0aa793b0d4dfe1e69 /src | |
| parent | bda0d0c1d4e5bf06cd1296c140e4f03ecba6836c (diff) | |
broadband-modem: skip SIM creation in CDMA-only modems
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-broadband-modem.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 939abe31..acabff51 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -169,10 +169,13 @@ modem_create_sim_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { + MMSim *sim; + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) return NULL; - return (g_object_ref (g_simple_async_result_get_op_res_gpointer ( - G_SIMPLE_ASYNC_RESULT (res)))); + + sim = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)); + return (sim ? g_object_ref (sim) : NULL); } static void @@ -211,6 +214,15 @@ modem_create_sim (MMIfaceModem *self, user_data, modem_create_sim); + /* CDMA-only modems don't need this */ + if (mm_iface_modem_is_cdma_only (self)) { + mm_dbg ("Skipping SIM creation in CDMA-only modem..."); + g_simple_async_result_set_op_res_gpointer (result, NULL, NULL); + g_simple_async_result_complete_in_idle (result); + g_object_unref (result); + return; + } + /* New generic SIM */ mm_sim_new (MM_BASE_MODEM (self), NULL, /* cancellable */ |