From 10ecf871f27ddd7170b6fb9ee7bd055b9cb3423c Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 12 Feb 2018 10:36:43 +0100 Subject: Remove wlr_backend.events.{output_remove,device_remove} --- backend/x11/backend.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'backend/x11') diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 2417810a..5608a2ea 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -230,9 +230,9 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) { xcb_flush(x11->xcb_conn); wlr_output_update_enabled(&output->wlr_output, true); - wlr_signal_emit_safe(&x11->backend.events.output_add, output); - wlr_signal_emit_safe(&x11->backend.events.input_add, &x11->keyboard_dev); - wlr_signal_emit_safe(&x11->backend.events.input_add, &x11->pointer_dev); + wlr_signal_emit_safe(&x11->backend.events.new_output, output); + wlr_signal_emit_safe(&x11->backend.events.new_input, &x11->keyboard_dev); + wlr_signal_emit_safe(&x11->backend.events.new_input, &x11->pointer_dev); wl_event_source_timer_update(x11->frame_timer, 16); @@ -249,8 +249,8 @@ static void wlr_x11_backend_destroy(struct wlr_backend *backend) { struct wlr_x11_output *output = &x11->output; wlr_output_destroy(&output->wlr_output); - wlr_signal_emit_safe(&backend->events.input_remove, &x11->pointer_dev); - wlr_signal_emit_safe(&backend->events.input_remove, &x11->keyboard_dev); + wlr_signal_emit_safe(&x11->pointer_dev.events.destroy, &x11->pointer_dev); + wlr_signal_emit_safe(&x11->keyboard_dev.events.destroy, &x11->keyboard_dev); // TODO probably need to use wlr_keyboard_destroy, but the devices need to // be malloced for that to work if (x11->keyboard_dev.keyboard->keymap) { -- cgit v1.2.3