diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-24 16:24:52 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-30 15:35:33 +0100 |
| commit | d09d02442ff19f7b0b47b6a5505d49ed3154c30a (patch) | |
| tree | 433ee24155a8a60d75aee08e9f2218b92174acef /src/mm-iface-modem.c | |
| parent | a12d1e36b0bcda80f3b7f0ae28513a086bb3fd91 (diff) | |
iface-modem,broadband-modem: update 'disabling->disabled' transition logic
It is not the Modem interface the one notifying about the 'disabling->disabled'
transition, it's the BroadbandModem directly doing it, covering all the
disabling sequences of all the interfaces.
Diffstat (limited to 'src/mm-iface-modem.c')
| -rw-r--r-- | src/mm-iface-modem.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c index caf8bfe7..55bad312 100644 --- a/src/mm-iface-modem.c +++ b/src/mm-iface-modem.c @@ -2594,7 +2594,6 @@ struct _DisablingContext { MMIfaceModem *self; DisablingStep step; MMModemState previous_state; - gboolean disabled; GSimpleAsyncResult *result; MmGdbusModem *skeleton; }; @@ -2603,17 +2602,6 @@ static void disabling_context_complete_and_free (DisablingContext *ctx) { g_simple_async_result_complete_in_idle (ctx->result); - - if (ctx->disabled) - mm_iface_modem_update_state (ctx->self, - MM_MODEM_STATE_DISABLED, - MM_MODEM_STATE_CHANGE_REASON_USER_REQUESTED); - else - /* Fallback to previous state */ - mm_iface_modem_update_state (ctx->self, - ctx->previous_state, - MM_MODEM_STATE_CHANGE_REASON_UNKNOWN); - g_object_unref (ctx->self); g_object_unref (ctx->result); if (ctx->skeleton) @@ -2693,7 +2681,6 @@ interface_disabling_step (DisablingContext *ctx) case DISABLING_STEP_LAST: /* We are done without errors! */ g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); - ctx->disabled = TRUE; disabling_context_complete_and_free (ctx); return; } @@ -2728,10 +2715,6 @@ mm_iface_modem_disable (MMIfaceModem *self, return; } - mm_iface_modem_update_state (ctx->self, - MM_MODEM_STATE_DISABLING, - MM_MODEM_STATE_CHANGE_REASON_USER_REQUESTED); - interface_disabling_step (ctx); } |