aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mm-generic-cdma.c2
-rw-r--r--src/mm-modem.c5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c
index dbaeb662..50cd86cb 100644
--- a/src/mm-generic-cdma.c
+++ b/src/mm-generic-cdma.c
@@ -598,7 +598,7 @@ connect (MMModem *modem,
info = mm_callback_info_new (modem, callback, user_data);
command = g_strconcat ("DT", number, NULL);
- mm_serial_port_queue_command (priv->primary, command, 60, dial_done, info);
+ mm_serial_port_queue_command (priv->primary, command, 90, dial_done, info);
g_free (command);
}
diff --git a/src/mm-modem.c b/src/mm-modem.c
index 27b77954..a65d8831 100644
--- a/src/mm-modem.c
+++ b/src/mm-modem.c
@@ -36,9 +36,6 @@ static void impl_modem_get_info (MMModem *modem, DBusGMethodInvocation *context)
GError *
mm_modem_check_removed (MMModem *self, const GError *error)
{
- if (g_error_matches (error, MM_MODEM_ERROR, MM_MODEM_ERROR_REMOVED))
- return g_error_copy (error);
-
if (!self) {
/* If the modem was NULL, the error *should* have been
* MM_MODEM_ERROR_REMOVED. If it wasn't, make it that.
@@ -48,7 +45,7 @@ mm_modem_check_removed (MMModem *self, const GError *error)
"The modem was removed.");
}
- return NULL;
+ return error ? g_error_copy (error) : NULL;
}
static void