diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mm-modem-hso.c | 2 | ||||
| -rw-r--r-- | plugins/mm-modem-mbm.c | 6 | ||||
| -rw-r--r-- | plugins/mm-modem-zte.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/plugins/mm-modem-hso.c b/plugins/mm-modem-hso.c index 4f7f9d9e..426ee0ab 100644 --- a/plugins/mm-modem-hso.c +++ b/plugins/mm-modem-hso.c @@ -300,7 +300,7 @@ hso_connect_timed_out (gpointer data) if (info) { info->error = g_error_new_literal (MM_SERIAL_ERROR, - MM_SERIAL_RESPONSE_TIMEOUT, + MM_SERIAL_ERROR_RESPONSE_TIMEOUT, "Connection timed out"); } diff --git a/plugins/mm-modem-mbm.c b/plugins/mm-modem-mbm.c index b41fc477..0a354742 100644 --- a/plugins/mm-modem-mbm.c +++ b/plugins/mm-modem-mbm.c @@ -405,11 +405,9 @@ mbm_emrdy_done (MMAtSerialPort *port, MMCallbackInfo *info = user_data; MMModemMbmPrivate *priv = MM_MODEM_MBM_GET_PRIVATE (info->modem); - if ( error - && error->domain == MM_SERIAL_ERROR - && error->code == MM_SERIAL_RESPONSE_TIMEOUT) { + if (g_error_matches (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_RESPONSE_TIMEOUT)) g_warning ("%s: timed out waiting for EMRDY response.", __func__); - } else + else priv->have_emrdy = TRUE; do_init (port, info); diff --git a/plugins/mm-modem-zte.c b/plugins/mm-modem-zte.c index 52746ac1..e837192a 100644 --- a/plugins/mm-modem-zte.c +++ b/plugins/mm-modem-zte.c @@ -371,7 +371,7 @@ pre_init_done (MMAtSerialPort *port, if (error) { /* Retry the init string one more time; the modem sometimes throws it away */ if ( !priv->init_retried - && g_error_matches (error, MM_SERIAL_ERROR, MM_SERIAL_RESPONSE_TIMEOUT)) { + && g_error_matches (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_RESPONSE_TIMEOUT)) { priv->init_retried = TRUE; enable_flash_done (MM_SERIAL_PORT (port), NULL, user_data); } else |