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

iface-modem-time: let initialization and enabling sequences get cancelled

Browse Source
This commit is contained in:
Aleksander Morgado
2012-03-13 12:35:15 +01:00
parent 9eebb75ca3
commit e2a56ba490
3 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mm-broadband-modem.c
View File

@@ -6306,6 +6306,7 @@ enabling_step (EnablingContext *ctx)
mm_dbg ("Modem has time capabilities, enabling the Time interface...");
/* Enabling the Modem Time interface */
mm_iface_modem_time_enable (MM_IFACE_MODEM_TIME (ctx->self),
ctx->cancellable,
(GAsyncReadyCallback)iface_modem_time_enable_ready,
ctx);
return;
@@ -6671,6 +6672,7 @@ initialize_step (InitializeContext *ctx)
case INITIALIZE_STEP_IFACE_TIME:
/* Initialize the Time interface */
mm_iface_modem_time_initialize (MM_IFACE_MODEM_TIME (ctx->self),
ctx->cancellable,
(GAsyncReadyCallback)iface_modem_time_initialize_ready,
ctx);
return;

48
src/mm-iface-modem-time.c
View File

@@ -569,11 +569,13 @@ struct _EnablingContext {
MMIfaceModemTime *self;
EnablingStep step;
GSimpleAsyncResult *result;
GCancellable *cancellable;
MmGdbusModemTime *skeleton;
};
static EnablingContext *
enabling_context_new (MMIfaceModemTime *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -581,6 +583,7 @@ enabling_context_new (MMIfaceModemTime *self,
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,
@@ -600,10 +603,25 @@ enabling_context_complete_and_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);
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_time_enable_finish (MMIfaceModemTime *self,
GAsyncResult *res,
@@ -672,6 +690,10 @@ enable_unsolicited_events_ready (MMIfaceModemTime *self,
static void
interface_enabling_step (EnablingContext *ctx)
{
/* Don't run new steps if we're cancelled */
if (enabling_context_complete_and_free_if_cancelled (ctx))
return;
switch (ctx->step) {
case ENABLING_STEP_FIRST:
/* Fall down to next step */
@@ -741,10 +763,12 @@ interface_enabling_step (EnablingContext *ctx)
void
mm_iface_modem_time_enable (MMIfaceModemTime *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
interface_enabling_step (enabling_context_new (self,
cancellable,
callback,
user_data));
}
@@ -765,11 +789,13 @@ struct _InitializationContext {
MMIfaceModemTime *self;
MmGdbusModemTime *skeleton;
GSimpleAsyncResult *result;
GCancellable *cancellable;
InitializationStep step;
};
static InitializationContext *
initialization_context_new (MMIfaceModemTime *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -777,6 +803,7 @@ initialization_context_new (MMIfaceModemTime *self,
ctx = g_new0 (InitializationContext, 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,
@@ -795,10 +822,25 @@ initialization_context_complete_and_free (InitializationContext *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);
g_object_unref (ctx->skeleton);
g_free (ctx);
}
static gboolean
initialization_context_complete_and_free_if_cancelled (InitializationContext *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 initialization cancelled");
initialization_context_complete_and_free (ctx);
return TRUE;
}
static void
check_support_ready (MMIfaceModemTime *self,
GAsyncResult *res,
@@ -829,6 +871,10 @@ check_support_ready (MMIfaceModemTime *self,
static void
interface_initialization_step (InitializationContext *ctx)
{
/* Don't run new steps if we're cancelled */
if (initialization_context_complete_and_free_if_cancelled (ctx))
return;
switch (ctx->step) {
case INITIALIZATION_STEP_FIRST:
/* Setup quarks if we didn't do it before */
@@ -916,6 +962,7 @@ mm_iface_modem_time_initialize_finish (MMIfaceModemTime *self,
void
mm_iface_modem_time_initialize (MMIfaceModemTime *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
@@ -937,6 +984,7 @@ mm_iface_modem_time_initialize (MMIfaceModemTime *self,
/* Perform async initialization here */
interface_initialization_step (initialization_context_new (self,
cancellable,
callback,
user_data));
g_object_unref (skeleton);

2
src/mm-iface-modem-time.h
View File

@@ -94,6 +94,7 @@ GType mm_iface_modem_time_get_type (void);
/* Initialize Time interface (async) */
void mm_iface_modem_time_initialize (MMIfaceModemTime *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean mm_iface_modem_time_initialize_finish (MMIfaceModemTime *self,
@@ -102,6 +103,7 @@ gboolean mm_iface_modem_time_initialize_finish (MMIfaceModemTime *self,
/* Enable Time interface (async) */
void mm_iface_modem_time_enable (MMIfaceModemTime *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean mm_iface_modem_time_enable_finish (MMIfaceModemTime *self,