summaryrefslogtreecommitdiff
path: root/shared/nm-glib-aux/nm-shared-utils.c
diff options
context:
space:
mode:
Diffstat (limited to 'shared/nm-glib-aux/nm-shared-utils.c')
-rw-r--r--shared/nm-glib-aux/nm-shared-utils.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c
index 44079dcf3a..74577c9c53 100644
--- a/shared/nm-glib-aux/nm-shared-utils.c
+++ b/shared/nm-glib-aux/nm-shared-utils.c
@@ -1643,16 +1643,13 @@ nm_utils_error_set_cancelled (GError **error,
}
gboolean
-nm_utils_error_is_cancelled (GError *error,
- gboolean consider_is_disposing)
+nm_utils_error_is_cancelled_or_disposing (GError *error)
{
if (error) {
if (error->domain == G_IO_ERROR)
return NM_IN_SET (error->code, G_IO_ERROR_CANCELLED);
- if (consider_is_disposing) {
- if (error->domain == NM_UTILS_ERROR)
- return NM_IN_SET (error->code, NM_UTILS_ERROR_CANCELLED_DISPOSING);
- }
+ if (error->domain == NM_UTILS_ERROR)
+ return NM_IN_SET (error->code, NM_UTILS_ERROR_CANCELLED_DISPOSING);
}
return FALSE;
}