|
|
|
@ -774,7 +774,7 @@ bool wlr_surface_set_role(struct wlr_surface *surface,
|
|
|
|
|
if (surface->role != NULL && surface->role != role) {
|
|
|
|
|
if (error_resource != NULL) {
|
|
|
|
|
wl_resource_post_error(error_resource, error_code,
|
|
|
|
|
"Cannot assign role %s to wl_surface@%" PRIu32 ", already has role %s\n",
|
|
|
|
|
"Cannot assign role %s to wl_surface@%" PRIu32 ", already has role %s",
|
|
|
|
|
role->name, wl_resource_get_id(surface->resource),
|
|
|
|
|
surface->role->name);
|
|
|
|
|
}
|
|
|
|
@ -782,9 +782,8 @@ bool wlr_surface_set_role(struct wlr_surface *surface,
|
|
|
|
|
}
|
|
|
|
|
if (surface->role_data != NULL && surface->role_data != role_data) {
|
|
|
|
|
wl_resource_post_error(error_resource, error_code,
|
|
|
|
|
"Cannot reassign role %s to wl_surface@%" PRIu32 ","
|
|
|
|
|
"role object still exists", role->name,
|
|
|
|
|
wl_resource_get_id(surface->resource));
|
|
|
|
|
"Cannot reassign role %s to wl_surface@%" PRIu32 ", role object still exists",
|
|
|
|
|
role->name, wl_resource_get_id(surface->resource));
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|