aboutsummaryrefslogtreecommitdiff
path: root/src/mm-iface-modem.c
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2012-10-24 16:25:38 +0200
committerAleksander Morgado <aleksander@lanedo.com>2012-10-30 15:35:34 +0100
commit28114f66d53a5f232904f2609778b9cd8f84ffa0 (patch)
tree1139eabde7b589d3b9f6775504444a65ce24c36b /src/mm-iface-modem.c
parentd09d02442ff19f7b0b47b6a5505d49ed3154c30a (diff)
iface-modem,broadband-modem: update 'enabling->enabled transition logic
It is not the Modem interface the one notifying about the 'enabling->enabled' transition, it's the BroadbandModem directly doing it, covering all the enabling sequences of all the interfaces.
Diffstat (limited to 'src/mm-iface-modem.c')
-rw-r--r--src/mm-iface-modem.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c
index 55bad312..082846e9 100644
--- a/src/mm-iface-modem.c
+++ b/src/mm-iface-modem.c
@@ -2742,7 +2742,6 @@ struct _EnablingContext {
EnablingStep step;
MMModemCharset supported_charsets;
const MMModemCharset *current_charset;
- gboolean enabled;
GSimpleAsyncResult *result;
GCancellable *cancellable;
MmGdbusModem *skeleton;
@@ -2752,26 +2751,6 @@ static void
enabling_context_complete_and_free (EnablingContext *ctx)
{
g_simple_async_result_complete_in_idle (ctx->result);
-
- if (ctx->enabled)
- mm_iface_modem_update_state (ctx->self,
- MM_MODEM_STATE_ENABLED,
- MM_MODEM_STATE_CHANGE_REASON_USER_REQUESTED);
- else if (ctx->skeleton) {
- MMModemLock lock;
-
- /* Fallback to DISABLED/LOCKED */
- lock = mm_gdbus_modem_get_unlock_required (ctx->skeleton);
- mm_iface_modem_update_state (
- ctx->self,
- ((lock == MM_MODEM_LOCK_NONE ||
- lock == MM_MODEM_LOCK_SIM_PIN2 ||
- lock == MM_MODEM_LOCK_SIM_PUK2) ?
- MM_MODEM_STATE_DISABLED :
- MM_MODEM_STATE_LOCKED),
- MM_MODEM_STATE_CHANGE_REASON_UNKNOWN);
- }
-
g_object_unref (ctx->self);
g_object_unref (ctx->result);
g_object_unref (ctx->cancellable);
@@ -3094,7 +3073,6 @@ 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);
- ctx->enabled = TRUE;
enabling_context_complete_and_free (ctx);
return;
}
@@ -3130,10 +3108,6 @@ mm_iface_modem_enable (MMIfaceModem *self,
return;
}
- mm_iface_modem_update_state (ctx->self,
- MM_MODEM_STATE_ENABLING,
- MM_MODEM_STATE_CHANGE_REASON_USER_REQUESTED);
-
interface_enabling_step (ctx);
}