aboutsummaryrefslogtreecommitdiffstats
path: root/build-aux
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2012-10-10 21:07:53 +0200
committerAleksander Morgado <aleksander@lanedo.com>2012-10-10 21:14:48 +0200
commit51eff87f79262c9e9c4321a2517331959bfd04c6 (patch)
treea8319d5542580d6e7ac7cf2fe01ce04acc9278cf /build-aux
parentdf87c30e93477e0d79bede0cc4973c2a6ef2ef87 (diff)
downloadexternal_libqmi-51eff87f79262c9e9c4321a2517331959bfd04c6.zip
external_libqmi-51eff87f79262c9e9c4321a2517331959bfd04c6.tar.gz
external_libqmi-51eff87f79262c9e9c4321a2517331959bfd04c6.tar.bz2
libqmi-glib,qmi-codegen: cancelled operations will issue an ABORT message
We allow passing a GCancellable to every async operation with the clients. Now, if the cancellable gets cancelled and the operation can be ABORT-ed, then we do it.
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/qmi-codegen/Client.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/build-aux/qmi-codegen/Client.py b/build-aux/qmi-codegen/Client.py
index 06b5aa7..5fa4178 100644
--- a/build-aux/qmi-codegen/Client.py
+++ b/build-aux/qmi-codegen/Client.py
@@ -373,7 +373,8 @@ class Client:
if message.abort:
template += (
- ' if (g_error_matches (error, QMI_CORE_ERROR, QMI_CORE_ERROR_TIMEOUT)) {\n'
+ ' if (g_error_matches (error, QMI_CORE_ERROR, QMI_CORE_ERROR_TIMEOUT) ||\n'
+ ' g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_ABORTED)) {\n'
' QmiMessage *abort;\n'
' GObject *self;\n'
' guint16 transaction_id;\n'