core: fix serial error #defines

Should have ERROR in them.
This commit is contained in:
Dan Williams
2010-04-24 23:44:35 -07:00
parent b9bb12a01e
commit a4c094c340
7 changed files with 24 additions and 26 deletions
+1 -1
View File
@@ -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");
}
+2 -4
View File
@@ -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);
+1 -1
View File
@@ -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