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

iface-modem-location: port mm_iface_modem_location_enable to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-06-27 01:42:28 -07:00
committed by Aleksander Morgado
parent 7c2c7bc763
commit 8101ce3f15
1 changed files with 35 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/mm-iface-modem-location.c
View File

@@ -1309,7 +1309,7 @@ mm_iface_modem_location_disable (MMIfaceModemLocation *self,
/*****************************************************************************/ /*****************************************************************************/
typedef struct _EnablingContext EnablingContext; typedef struct _EnablingContext EnablingContext;
static void interface_enabling_step (EnablingContext *ctx); static void interface_enabling_step (GTask *task);
typedef enum { typedef enum {
ENABLING_STEP_FIRST, ENABLING_STEP_FIRST,
@@ -1318,71 +1318,60 @@ typedef enum {
} EnablingStep; } EnablingStep;
struct _EnablingContext { struct _EnablingContext {
MMIfaceModemLocation *self;
EnablingStep step; EnablingStep step;
GSimpleAsyncResult *result;
GCancellable *cancellable;
MmGdbusModemLocation *skeleton; MmGdbusModemLocation *skeleton;
}; };
static void 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) if (ctx->skeleton)
g_object_unref (ctx->skeleton); g_object_unref (ctx->skeleton);
g_free (ctx); 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 gboolean
mm_iface_modem_location_enable_finish (MMIfaceModemLocation *self, mm_iface_modem_location_enable_finish (MMIfaceModemLocation *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) 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 static void
enabling_location_gathering_ready (MMIfaceModemLocation *self, enabling_location_gathering_ready (MMIfaceModemLocation *self,
GAsyncResult *res, GAsyncResult *res,
EnablingContext *ctx) GTask *task)
{ {
EnablingContext *ctx;
GError *error = NULL; GError *error = NULL;
if (!setup_gathering_finish (self, res, &error)) { if (!setup_gathering_finish (self, res, &error)) {
g_simple_async_result_take_error (ctx->result, error); g_task_return_error (task, error);
enabling_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
/* Go on to next step */ /* Go on to next step */
ctx = g_task_get_task_data (task);
ctx->step++; ctx->step++;
interface_enabling_step (ctx); interface_enabling_step (task);
} }
static void static void
interface_enabling_step (EnablingContext *ctx) interface_enabling_step (GTask *task)
{ {
MMIfaceModemLocation *self;
EnablingContext *ctx;
/* Don't run new steps if we're cancelled */ /* 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; return;
}
self = g_task_get_source_object (task);
ctx = g_task_get_task_data (task);
switch (ctx->step) { switch (ctx->step) {
case ENABLING_STEP_FIRST: case ENABLING_STEP_FIRST:
@@ -1399,17 +1388,17 @@ interface_enabling_step (EnablingContext *ctx)
MM_MODEM_LOCATION_SOURCE_GPS_UNMANAGED | MM_MODEM_LOCATION_SOURCE_GPS_UNMANAGED |
MM_MODEM_LOCATION_SOURCE_AGPS); MM_MODEM_LOCATION_SOURCE_AGPS);
setup_gathering (ctx->self, setup_gathering (self,
default_sources, default_sources,
(GAsyncReadyCallback)enabling_location_gathering_ready, (GAsyncReadyCallback)enabling_location_gathering_ready,
ctx); task);
return; return;
} }
case ENABLING_STEP_LAST: case ENABLING_STEP_LAST:
/* We are done without errors! */ /* We are done without errors! */
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); g_task_return_boolean (task, TRUE);
enabling_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
@@ -1423,28 +1412,27 @@ mm_iface_modem_location_enable (MMIfaceModemLocation *self,
gpointer user_data) gpointer user_data)
{ {
EnablingContext *ctx; EnablingContext *ctx;
GTask *task;
ctx = g_new0 (EnablingContext, 1); 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_location_enable);
ctx->step = ENABLING_STEP_FIRST; 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_LOCATION_DBUS_SKELETON, &ctx->skeleton, MM_IFACE_MODEM_LOCATION_DBUS_SKELETON, &ctx->skeleton,
NULL); NULL);
if (!ctx->skeleton) { if (!ctx->skeleton) {
g_simple_async_result_set_error (ctx->result, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Couldn't get interface skeleton"); "Couldn't get interface skeleton");
enabling_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
interface_enabling_step (ctx); interface_enabling_step (task);
} }
/*****************************************************************************/ /*****************************************************************************/