mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text: Only allow input-method started by weston to bind

Browse Source 
Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
dev
Jan Arne Petersen 12 years ago committed by Kristian Høgsberg
parent 7cd29e199a
commit b41531a88e
1 changed files with 14 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 21
      src/text-backend.c

21
src/text-backend.c
Unescape View File

@ -759,17 +759,24 @@ bind_input_method(struct wl_client *client,
NULL, NULL,
id, input_method); id, input_method);
if (input_method->input_method_binding == NULL) { if (input_method->input_method_binding != NULL) {
resource->destroy = unbind_input_method; wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
input_method->input_method_binding = resource; "interface object already bound");
wl_resource_destroy(resource);
return;
}
text_backend->input_method.binding = resource; if (text_backend->input_method.client != client) {
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
"permission to bind desktop_shell denied");
wl_resource_destroy(resource);
return; return;
} }
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT, resource->destroy = unbind_input_method;
"interface object already bound"); input_method->input_method_binding = resource;
wl_resource_destroy(resource);
text_backend->input_method.binding = resource;
} }
static void static void

Write Preview
Loading…
Cancel
Save