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

iface-modem: avoid using MM_CORE_ERROR_CANCELLED

Browse Source
This commit is contained in:
Aleksander Morgado
2019-10-09 10:49:25 +02:00
parent 651bfd62b4
commit cf0d3f36fd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,8 +315,8 @@ load_unlock_required_ready (MMIfaceModem *self,
/* For several kinds of errors, just return them directly */ /* For several kinds of errors, just return them directly */
if (error->domain == MM_SERIAL_ERROR || if (error->domain == MM_SERIAL_ERROR ||
g_error_matches (error, g_error_matches (error,
MM_CORE_ERROR, G_IO_ERROR,
MM_CORE_ERROR_CANCELLED) || G_IO_ERROR_CANCELLED) ||
g_error_matches (error, g_error_matches (error,
MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR,
MM_MOBILE_EQUIPMENT_ERROR_SIM_NOT_INSERTED) || MM_MOBILE_EQUIPMENT_ERROR_SIM_NOT_INSERTED) ||
@@ -3316,8 +3316,8 @@ internal_load_unlock_required_ready (MMIfaceModem *self,
* state. */ * state. */
if (error->domain == MM_SERIAL_ERROR || if (error->domain == MM_SERIAL_ERROR ||
g_error_matches (error, g_error_matches (error,
MM_CORE_ERROR, G_IO_ERROR,
MM_CORE_ERROR_CANCELLED)) { G_IO_ERROR_CANCELLED)) {
ctx->saved_error = error; ctx->saved_error = error;
ctx->step = UPDATE_LOCK_INFO_CONTEXT_STEP_LAST; ctx->step = UPDATE_LOCK_INFO_CONTEXT_STEP_LAST;
update_lock_info_context_step (task); update_lock_info_context_step (task);