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

3gpp: errors when reloading operator name/code will reset the values in the interface

Browse Source
This commit is contained in:
Aleksander Morgado
2012-03-29 17:15:48 +02:00
parent bb2f9b672c
commit dc376bb725
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -579,7 +579,6 @@ load_operator_name_ready (MMIfaceModem3gpp *self,
if (error) { if (error) {
mm_warn ("Couldn't load Operator Name: '%s'", error->message); mm_warn ("Couldn't load Operator Name: '%s'", error->message);
g_error_free (error); g_error_free (error);
return;
} }
g_object_get (self, g_object_get (self,
@@ -630,7 +629,6 @@ load_operator_code_ready (MMIfaceModem3gpp *self,
if (error) { if (error) {
mm_warn ("Couldn't load Operator Code: '%s'", error->message); mm_warn ("Couldn't load Operator Code: '%s'", error->message);
g_error_free (error); g_error_free (error);
return;
} }
g_object_get (self, g_object_get (self,
@@ -639,14 +637,12 @@ load_operator_code_ready (MMIfaceModem3gpp *self,
mm_gdbus_modem3gpp_set_operator_code (skeleton, str); mm_gdbus_modem3gpp_set_operator_code (skeleton, str);
/* If we also implement the location interface, update the 3GPP location */ /* If we also implement the location interface, update the 3GPP location */
if (MM_IS_IFACE_MODEM_LOCATION (self)) { if (str && MM_IS_IFACE_MODEM_LOCATION (self)) {
guint mcc = 0; guint mcc = 0;
guint mnc = 0; guint mnc = 0;
if (parse_mcc_mnc (str, &mcc, &mnc)) if (parse_mcc_mnc (str, &mcc, &mnc))
mm_iface_modem_location_3gpp_update_mcc_mnc (MM_IFACE_MODEM_LOCATION (self), mm_iface_modem_location_3gpp_update_mcc_mnc (MM_IFACE_MODEM_LOCATION (self), mcc, mnc);
mcc,
mnc);
} }
g_free (str); g_free (str);