diff options
Diffstat (limited to 'src/mm-iface-modem.c')
| -rw-r--r-- | src/mm-iface-modem.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c index fcdbc766..45e273a2 100644 --- a/src/mm-iface-modem.c +++ b/src/mm-iface-modem.c @@ -22,7 +22,7 @@ #include "mm-iface-modem.h" #include "mm-base-modem.h" #include "mm-base-modem-at.h" -#include "mm-sim.h" +#include "mm-base-sim.h" #include "mm-bearer-list.h" #include "mm-log.h" #include "mm-context.h" @@ -4037,7 +4037,7 @@ sim_new_ready (GAsyncInitable *initable, GAsyncResult *res, InitializationContext *ctx) { - MMSim *sim; + MMBaseSim *sim; GError *error = NULL; sim = MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->create_sim_finish (ctx->self, res, &error); @@ -4051,7 +4051,7 @@ sim_new_ready (GAsyncInitable *initable, /* We may get error with !sim, when the implementation doesn't want to * handle any (e.g. CDMA) */ if (sim) { - g_object_bind_property (sim, MM_SIM_PATH, + g_object_bind_property (sim, MM_BASE_SIM_PATH, ctx->skeleton, "sim", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); @@ -4067,13 +4067,13 @@ sim_new_ready (GAsyncInitable *initable, } static void -sim_reinit_ready (MMSim *sim, +sim_reinit_ready (MMBaseSim *sim, GAsyncResult *res, InitializationContext *ctx) { GError *error = NULL; - if (!mm_sim_initialize_finish (sim, res, &error)) { + if (!mm_base_sim_initialize_finish (sim, res, &error)) { mm_warn ("SIM re-initialization failed: '%s'", error ? error->message : "Unknown error"); g_clear_error (&error); @@ -4544,7 +4544,7 @@ interface_initialization_step (InitializationContext *ctx) if (!mm_iface_modem_is_cdma_only (ctx->self) && MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->create_sim && MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->create_sim_finish) { - MMSim *sim = NULL; + MMBaseSim *sim = NULL; g_object_get (ctx->self, MM_IFACE_MODEM_SIM, &sim, @@ -4560,10 +4560,10 @@ interface_initialization_step (InitializationContext *ctx) /* If already available the sim object, relaunch initialization. * This will try to load any missing property value that couldn't be * retrieved before due to having the SIM locked. */ - mm_sim_initialize (sim, - ctx->cancellable, - (GAsyncReadyCallback)sim_reinit_ready, - ctx); + mm_base_sim_initialize (sim, + ctx->cancellable, + (GAsyncReadyCallback)sim_reinit_ready, + ctx); g_object_unref (sim); return; } @@ -5082,7 +5082,7 @@ iface_modem_init (gpointer g_iface) g_param_spec_object (MM_IFACE_MODEM_SIM, "SIM", "SIM object", - MM_TYPE_SIM, + MM_TYPE_BASE_SIM, G_PARAM_READWRITE)); g_object_interface_install_property |