mirror of
https://github.com/labwc/labwc.git
synced 2025-10-29 05:40:24 -04:00
ime: don't use data argument in some signal handlers
In wlroots 0.20, the those data argument will be just NULL.
This commit is contained in:
parent
2547f96984
commit
e530f43708
1 changed files with 4 additions and 4 deletions
|
|
@ -270,8 +270,7 @@ handle_input_method_commit(struct wl_listener *listener, void *data)
|
|||
{
|
||||
struct input_method_relay *relay =
|
||||
wl_container_of(listener, relay, input_method_commit);
|
||||
struct wlr_input_method_v2 *input_method = data;
|
||||
assert(relay->input_method == input_method);
|
||||
struct wlr_input_method_v2 *input_method = relay->input_method;
|
||||
|
||||
struct text_input *text_input = relay->active_text_input;
|
||||
if (!text_input) {
|
||||
|
|
@ -305,7 +304,9 @@ handle_keyboard_grab_destroy(struct wl_listener *listener, void *data)
|
|||
{
|
||||
struct input_method_relay *relay =
|
||||
wl_container_of(listener, relay, keyboard_grab_destroy);
|
||||
struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = data;
|
||||
struct wlr_input_method_keyboard_grab_v2 *keyboard_grab =
|
||||
relay->input_method->keyboard_grab;
|
||||
|
||||
wl_list_remove(&relay->keyboard_grab_destroy.link);
|
||||
|
||||
if (keyboard_grab->keyboard) {
|
||||
|
|
@ -343,7 +344,6 @@ handle_input_method_destroy(struct wl_listener *listener, void *data)
|
|||
{
|
||||
struct input_method_relay *relay =
|
||||
wl_container_of(listener, relay, input_method_destroy);
|
||||
assert(relay->input_method == data);
|
||||
wl_list_remove(&relay->input_method_commit.link);
|
||||
wl_list_remove(&relay->input_method_grab_keyboard.link);
|
||||
wl_list_remove(&relay->input_method_new_popup_surface.link);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue