aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Chan <benchan@chromium.org>2013-08-27 00:15:39 -0700
committerDan Williams <dcbw@redhat.com>2013-08-27 09:57:14 -0500
commit387c97d81f3cd28524ba0b33e0e11c34f82ef2a8 (patch)
tree59318c0d9a37d7230915ead040764fb132edf001
parent2b28b7acb65df8e5778dde04225274db0a1e99da (diff)
novatel-lte: check if a connect operation has been cancelled
-rw-r--r--plugins/novatel/mm-broadband-bearer-novatel-lte.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.c b/plugins/novatel/mm-broadband-bearer-novatel-lte.c
index 7f023bc6..4681c6e5 100644
--- a/plugins/novatel/mm-broadband-bearer-novatel-lte.c
+++ b/plugins/novatel/mm-broadband-bearer-novatel-lte.c
@@ -196,6 +196,16 @@ connect_3gpp_qmistatus_ready (MMBaseModem *modem,
}
mm_dbg ("Error: '%s'", result);
+
+ if (g_cancellable_is_cancelled (ctx->cancellable)) {
+ g_simple_async_result_set_error (ctx->result,
+ MM_CORE_ERROR,
+ MM_CORE_ERROR_CANCELLED,
+ "Connection setup operation has been cancelled");
+ detailed_connect_context_complete_and_free (ctx);
+ return;
+ }
+
if (ctx->retries > 0) {
ctx->retries--;
mm_dbg ("Retrying status check in a second. %d retries left.",