And make sure we clear off the remaing client resources when doing an
unbind.
It seems we would hit it when checking set_background/ready/set_panel
requests, resulting in a protocol violation and finally terminating the
connection.
Bug-AGL: SPEC-4977
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: Ie5ed881511ec2ac4501d2a5cac349abc7f83c1fe
ivi->shell_client.status == BOUND_FAILED) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
ivi->shell_client.status == BOUND_FAILED) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
- "agl_shell has already been bound. "
- "Check out bound_fail event");
+ "agl_shell (ready quest) has already "
+ "been bound. Check out bound_fail event");
ivi->shell_client.resource_ext == shell_res) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
ivi->shell_client.resource_ext == shell_res) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
- "agl_shell has already been bound. "
- "Check out bound_fail event");
+ "agl_shell (set_background) has already "
+ "been bound. Check out bound_fail event");
ivi->shell_client.resource_ext == shell_res) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
ivi->shell_client.resource_ext == shell_res) {
wl_resource_post_error(shell_res,
WL_DISPLAY_ERROR_INVALID_OBJECT,
- "agl_shell has already been bound. "
+ "agl_shell (set_panel) has already been bound. "
"Check out bound_fail event");
return;
}
"Check out bound_fail event");
return;
}
ivi->shell_client.ready = false;
ivi->shell_client.resource = NULL;
ivi->shell_client.ready = false;
ivi->shell_client.resource = NULL;
+ ivi->shell_client.resource_ext = NULL;
ivi->shell_client.client = NULL;
}
ivi->shell_client.client = NULL;
}
struct ivi_compositor *ivi = wl_resource_get_user_data(resource);
ivi->shell_client_ext.resource = NULL;
struct ivi_compositor *ivi = wl_resource_get_user_data(resource);
ivi->shell_client_ext.resource = NULL;
+ ivi->shell_client.resource_ext = NULL;