summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2018-09-10 12:16:10 +1200
committerGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>2018-09-10 15:45:31 +0000
commit37d02369b77a57b750b74a8fa2c59ff401f31b98 (patch)
tree191e7c1b28cb06a766f55280ba83e727e6476b30
parentf7798f5dfa09bd69b79d8c9be1716c83d3ffc578 (diff)
downloadgnome-control-center-37d02369b77a57b750b74a8fa2c59ff401f31b98.tar.gz
region: Cancel async permission requests when panel is closed
-rw-r--r--panels/region/cc-region-panel.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
index 0023e3ab2..b20106d09 100644
--- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c
@@ -524,7 +524,7 @@ activate_language_row (CcRegionPanel *self,
} else if (g_permission_get_can_acquire (self->permission)) {
self->op = CHOOSE_LANGUAGE;
g_permission_acquire_async (self->permission,
- NULL,
+ self->cancellable,
permission_acquired,
self);
}
@@ -534,7 +534,7 @@ activate_language_row (CcRegionPanel *self,
} else if (g_permission_get_can_acquire (self->permission)) {
self->op = CHOOSE_REGION;
g_permission_acquire_async (self->permission,
- NULL,
+ self->cancellable,
permission_acquired,
self);
}
@@ -1069,7 +1069,7 @@ add_input (CcRegionPanel *self)
} else if (g_permission_get_can_acquire (self->permission)) {
self->op = ADD_INPUT;
g_permission_acquire_async (self->permission,
- NULL,
+ self->cancellable,
permission_acquired,
self);
}
@@ -1130,7 +1130,7 @@ remove_selected_input (CcRegionPanel *self)
} else if (g_permission_get_can_acquire (self->permission)) {
self->op = REMOVE_INPUT;
g_permission_acquire_async (self->permission,
- NULL,
+ self->cancellable,
permission_acquired,
self);
}
@@ -1180,7 +1180,7 @@ move_selected_input (CcRegionPanel *self,
} else if (g_permission_get_can_acquire (self->permission)) {
self->op = op;
g_permission_acquire_async (self->permission,
- NULL,
+ self->cancellable,
permission_acquired,
self);
}