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

3gpp: let operator name/code reloading be requested by implementations

Browse Source
This commit is contained in:
Aleksander Morgado
2012-03-29 17:16:38 +02:00
parent dc376bb725
commit 43bd3f95ae
2 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/mm-iface-modem-3gpp.c
View File

@@ -649,6 +649,45 @@ load_operator_code_ready (MMIfaceModem3gpp *self,
g_object_unref (skeleton); g_object_unref (skeleton);
} }
void
mm_iface_modem_3gpp_reload_current_operator (MMIfaceModem3gpp *self)
{
MMModem3gppRegistrationState state = MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN;
MmGdbusModem3gpp *skeleton = NULL;
g_object_get (self,
MM_IFACE_MODEM_3GPP_REGISTRATION_STATE, &state,
MM_IFACE_MODEM_3GPP_DBUS_SKELETON, &skeleton,
NULL);
if (state == MM_MODEM_3GPP_REGISTRATION_STATE_HOME ||
state == MM_MODEM_3GPP_REGISTRATION_STATE_ROAMING) {
/* Launch operator code update */
if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_operator_code &&
MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_operator_code_finish)
MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_operator_code (
self,
(GAsyncReadyCallback)load_operator_code_ready,
NULL);
/* Launch operator name update */
if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_operator_name &&
MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_operator_name_finish)
MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_operator_name (
self,
(GAsyncReadyCallback)load_operator_name_ready,
NULL);
} else {
mm_gdbus_modem3gpp_set_operator_code (skeleton, NULL);
mm_gdbus_modem3gpp_set_operator_name (skeleton, NULL);
if (MM_IS_IFACE_MODEM_LOCATION (self))
mm_iface_modem_location_3gpp_update_mcc_mnc (MM_IFACE_MODEM_LOCATION (self), 0, 0);
}
g_object_unref (skeleton);
}
/*****************************************************************************/
static void static void
update_registration_state (MMIfaceModem3gpp *self, update_registration_state (MMIfaceModem3gpp *self,
MMModem3gppRegistrationState new_state, MMModem3gppRegistrationState new_state,
@@ -677,23 +716,11 @@ update_registration_state (MMIfaceModem3gpp *self,
MM_IFACE_MODEM_3GPP_REGISTRATION_STATE, new_state, MM_IFACE_MODEM_3GPP_REGISTRATION_STATE, new_state,
NULL); NULL);
/* Reload current operator */
mm_iface_modem_3gpp_reload_current_operator (self);
if (new_state == MM_MODEM_3GPP_REGISTRATION_STATE_HOME || if (new_state == MM_MODEM_3GPP_REGISTRATION_STATE_HOME ||
new_state == MM_MODEM_3GPP_REGISTRATION_STATE_ROAMING) { new_state == MM_MODEM_3GPP_REGISTRATION_STATE_ROAMING) {
/* Launch operator code update */
if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_operator_code &&
MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_operator_code_finish)
MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_operator_code (
self,
(GAsyncReadyCallback)load_operator_code_ready,
NULL);
/* Launch operator name update */
if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_operator_name &&
MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_operator_name_finish)
MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_operator_name (
self,
(GAsyncReadyCallback)load_operator_name_ready,
NULL);
mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self), mm_iface_modem_update_subsystem_state (MM_IFACE_MODEM (self),
SUBSYSTEM_3GPP, SUBSYSTEM_3GPP,
MM_MODEM_STATE_REGISTERED, MM_MODEM_STATE_REGISTERED,
@@ -701,9 +728,6 @@ update_registration_state (MMIfaceModem3gpp *self,
} }
/* Not registered neither in home nor roaming network */ /* Not registered neither in home nor roaming network */
else { else {
mm_gdbus_modem3gpp_set_operator_code (skeleton, NULL);
mm_gdbus_modem3gpp_set_operator_name (skeleton, NULL);
mm_iface_modem_update_subsystem_state ( mm_iface_modem_update_subsystem_state (
MM_IFACE_MODEM (self), MM_IFACE_MODEM (self),
SUBSYSTEM_3GPP, SUBSYSTEM_3GPP,

3
src/mm-iface-modem-3gpp.h
View File

@@ -262,6 +262,9 @@ gboolean mm_iface_modem_3gpp_run_all_registration_checks_finish (MMIfaceModem3gp
GAsyncResult *res, GAsyncResult *res,
GError **error); GError **error);
/* Request to reload current operator */
void mm_iface_modem_3gpp_reload_current_operator (MMIfaceModem3gpp *self);
/* Allow registering in the network */ /* Allow registering in the network */
gboolean mm_iface_modem_3gpp_register_in_network_finish (MMIfaceModem3gpp *self, gboolean mm_iface_modem_3gpp_register_in_network_finish (MMIfaceModem3gpp *self,
GAsyncResult *res, GAsyncResult *res,