aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2011-12-20 16:05:40 +0100
committerAleksander Morgado <aleksander@lanedo.com>2012-03-15 14:14:35 +0100
commite86c8554cc60f8349cd121a3b5b46b0b800a8f04 (patch)
tree7b0981694722e3c19eb0294aabe059aa5c084348
parentddac446e86319156eb520da159d2a661047afd4e (diff)
broadband-modem: bearer connection allowance handled in ifaces
-rw-r--r--src/mm-broadband-modem.c14
-rw-r--r--src/mm-iface-modem-3gpp.c1
2 files changed, 1 insertions, 14 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 6a5cf342..e5eb9488 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -1136,20 +1136,6 @@ reg_state_changed (MMAtSerialPort *port,
state = get_consolidated_reg_state (self);
mm_iface_modem_3gpp_update_registration_state (MM_IFACE_MODEM_3GPP (self), state);
- /* Allow or forbid connection in 3GPP bearers, based on the new
- * registration state.
- *
- * TODO: don't allow bearers to get connected if roaming forbidden */
- if (state == MM_MODEM_3GPP_REGISTRATION_STATE_HOME ||
- state == MM_MODEM_3GPP_REGISTRATION_STATE_ROAMING)
- mm_bearer_list_foreach (self->priv->modem_bearer_list,
- (MMBearerListForeachFunc)mm_bearer_set_connection_allowed,
- NULL);
- else
- mm_bearer_list_foreach (self->priv->modem_bearer_list,
- (MMBearerListForeachFunc)mm_bearer_set_connection_forbidden,
- NULL);
-
/* If registration is finished (either registered or failed) but the
* registration query hasn't completed yet, just remove the timeout and
* let the registration query complete by itself.
diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c
index c71641f4..eb34b283 100644
--- a/src/mm-iface-modem-3gpp.c
+++ b/src/mm-iface-modem-3gpp.c
@@ -412,6 +412,7 @@ STR_REPLY_READY_FN (operator_name, "Operator Name")
static void
set_bearer_3gpp_connection_allowed (MMBearer *bearer)
{
+ /* TODO: don't allow bearers to get connected if roaming forbidden */
if (MM_IS_BEARER_3GPP (bearer))
mm_bearer_set_connection_allowed (bearer);
}