diff options
| -rw-r--r-- | src/mm-iface-modem-voice.c | 108 |
1 files changed, 49 insertions, 59 deletions
diff --git a/src/mm-iface-modem-voice.c b/src/mm-iface-modem-voice.c index 2a93907f..b075796b 100644 --- a/src/mm-iface-modem-voice.c +++ b/src/mm-iface-modem-voice.c @@ -668,7 +668,7 @@ mm_iface_modem_voice_disable (MMIfaceModemVoice *self, /*****************************************************************************/ typedef struct _EnablingContext EnablingContext; -static void interface_enabling_step (EnablingContext *ctx); +static void interface_enabling_step (GTask *task); typedef enum { ENABLING_STEP_FIRST, @@ -678,72 +678,54 @@ typedef enum { } EnablingStep; struct _EnablingContext { - MMIfaceModemVoice *self; EnablingStep step; - GSimpleAsyncResult *result; - GCancellable *cancellable; MmGdbusModemVoice *skeleton; guint mem1_storage_index; }; static void -enabling_context_complete_and_free (EnablingContext *ctx) +enabling_context_free (EnablingContext *ctx) { - g_simple_async_result_complete_in_idle (ctx->result); - g_object_unref (ctx->self); - g_object_unref (ctx->result); - g_object_unref (ctx->cancellable); if (ctx->skeleton) g_object_unref (ctx->skeleton); g_free (ctx); } -static gboolean -enabling_context_complete_and_free_if_cancelled (EnablingContext *ctx) -{ - if (!g_cancellable_is_cancelled (ctx->cancellable)) - return FALSE; - - g_simple_async_result_set_error (ctx->result, - MM_CORE_ERROR, - MM_CORE_ERROR_CANCELLED, - "Interface enabling cancelled"); - enabling_context_complete_and_free (ctx); - return TRUE; -} - gboolean mm_iface_modem_voice_enable_finish (MMIfaceModemVoice *self, GAsyncResult *res, GError **error) { - return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); + return g_task_propagate_boolean (G_TASK (res), error); } static void setup_unsolicited_events_ready (MMIfaceModemVoice *self, GAsyncResult *res, - EnablingContext *ctx) + GTask *task) { + EnablingContext *ctx; GError *error = NULL; MM_IFACE_MODEM_VOICE_GET_INTERFACE (self)->setup_unsolicited_events_finish (self, res, &error); if (error) { - g_simple_async_result_take_error (ctx->result, error); - enabling_context_complete_and_free (ctx); + g_task_return_error (task, error); + g_object_unref (task); return; } /* Go on to next step */ + ctx = g_task_get_task_data (task); ctx->step++; - interface_enabling_step (ctx); + interface_enabling_step (task); } static void enable_unsolicited_events_ready (MMIfaceModemVoice *self, GAsyncResult *res, - EnablingContext *ctx) + GTask *task) { + EnablingContext *ctx; GError *error = NULL; /* Not critical! */ @@ -753,23 +735,32 @@ enable_unsolicited_events_ready (MMIfaceModemVoice *self, } /* Go on with next step */ + ctx = g_task_get_task_data (task); ctx->step++; - interface_enabling_step (ctx); + interface_enabling_step (task); } static void -interface_enabling_step (EnablingContext *ctx) +interface_enabling_step (GTask *task) { + MMIfaceModemVoice *self; + EnablingContext *ctx; + /* Don't run new steps if we're cancelled */ - if (enabling_context_complete_and_free_if_cancelled (ctx)) + if (g_task_return_error_if_cancelled (task)) { + g_object_unref (task); return; + } + + self = g_task_get_source_object (task); + ctx = g_task_get_task_data (task); switch (ctx->step) { case ENABLING_STEP_FIRST: { MMCallList *list; - list = mm_call_list_new (MM_BASE_MODEM (ctx->self)); - g_object_set (ctx->self, + list = mm_call_list_new (MM_BASE_MODEM (self)); + g_object_set (self, MM_IFACE_MODEM_VOICE_CALL_LIST, list, NULL); @@ -791,12 +782,12 @@ interface_enabling_step (EnablingContext *ctx) case ENABLING_STEP_SETUP_UNSOLICITED_EVENTS: /* Allow setting up unsolicited events */ - if (MM_IFACE_MODEM_VOICE_GET_INTERFACE (ctx->self)->setup_unsolicited_events && - MM_IFACE_MODEM_VOICE_GET_INTERFACE (ctx->self)->setup_unsolicited_events_finish) { - MM_IFACE_MODEM_VOICE_GET_INTERFACE (ctx->self)->setup_unsolicited_events ( - ctx->self, + if (MM_IFACE_MODEM_VOICE_GET_INTERFACE (self)->setup_unsolicited_events && + MM_IFACE_MODEM_VOICE_GET_INTERFACE (self)->setup_unsolicited_events_finish) { + MM_IFACE_MODEM_VOICE_GET_INTERFACE (self)->setup_unsolicited_events ( + self, (GAsyncReadyCallback)setup_unsolicited_events_ready, - ctx); + task); return; } /* Fall down to next step */ @@ -804,12 +795,12 @@ interface_enabling_step (EnablingContext *ctx) case ENABLING_STEP_ENABLE_UNSOLICITED_EVENTS: /* Allow setting up unsolicited events */ - if (MM_IFACE_MODEM_VOICE_GET_INTERFACE (ctx->self)->enable_unsolicited_events && - MM_IFACE_MODEM_VOICE_GET_INTERFACE (ctx->self)->enable_unsolicited_events_finish) { - MM_IFACE_MODEM_VOICE_GET_INTERFACE (ctx->self)->enable_unsolicited_events ( - ctx->self, + if (MM_IFACE_MODEM_VOICE_GET_INTERFACE (self)->enable_unsolicited_events && + MM_IFACE_MODEM_VOICE_GET_INTERFACE (self)->enable_unsolicited_events_finish) { + MM_IFACE_MODEM_VOICE_GET_INTERFACE (self)->enable_unsolicited_events ( + self, (GAsyncReadyCallback)enable_unsolicited_events_ready, - ctx); + task); return; } /* Fall down to next step */ @@ -817,8 +808,8 @@ interface_enabling_step (EnablingContext *ctx) case ENABLING_STEP_LAST: /* We are done without errors! */ - g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); - enabling_context_complete_and_free (ctx); + g_task_return_boolean (task, TRUE); + g_object_unref (task); return; } @@ -832,28 +823,27 @@ mm_iface_modem_voice_enable (MMIfaceModemVoice *self, gpointer user_data) { EnablingContext *ctx; + GTask *task; ctx = g_new0 (EnablingContext, 1); - ctx->self = g_object_ref (self); - ctx->cancellable = g_object_ref (cancellable); - ctx->result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - mm_iface_modem_voice_enable); ctx->step = ENABLING_STEP_FIRST; - g_object_get (ctx->self, + + task = g_task_new (self, cancellable, callback, user_data); + g_task_set_task_data (task, ctx, (GDestroyNotify)enabling_context_free); + + g_object_get (self, MM_IFACE_MODEM_VOICE_DBUS_SKELETON, &ctx->skeleton, NULL); if (!ctx->skeleton) { - g_simple_async_result_set_error (ctx->result, - MM_CORE_ERROR, - MM_CORE_ERROR_FAILED, - "Couldn't get interface skeleton"); - enabling_context_complete_and_free (ctx); + g_task_return_new_error (task, + MM_CORE_ERROR, + MM_CORE_ERROR_FAILED, + "Couldn't get interface skeleton"); + g_object_unref (task); return; } - interface_enabling_step (ctx); + interface_enabling_step (task); } /*****************************************************************************/ |