From 0d5e4ffb96879a7cd59eab2a2134206ea9a55051 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Mon, 24 May 2021 16:13:21 +0300 Subject: [PATCH] desktop-shell: rename output_listener to shell_output Most other places call a variable like this 'shell_output', so let's do that here too. The old name was really confusing. Signed-off-by: Pekka Paalanen --- desktop-shell/shell.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 9cc1844b..ce1c286b 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -4868,19 +4868,19 @@ shell_output_changed_move_layer(struct desktop_shell *shell, static void handle_output_destroy(struct wl_listener *listener, void *data) { - struct shell_output *output_listener = + struct shell_output *shell_output = container_of(listener, struct shell_output, destroy_listener); - struct desktop_shell *shell = output_listener->shell; + struct desktop_shell *shell = shell_output->shell; shell_for_each_layer(shell, shell_output_changed_move_layer, NULL); - if (output_listener->panel_surface) - wl_list_remove(&output_listener->panel_surface_listener.link); - if (output_listener->background_surface) - wl_list_remove(&output_listener->background_surface_listener.link); - wl_list_remove(&output_listener->destroy_listener.link); - wl_list_remove(&output_listener->link); - free(output_listener); + if (shell_output->panel_surface) + wl_list_remove(&shell_output->panel_surface_listener.link); + if (shell_output->background_surface) + wl_list_remove(&shell_output->background_surface_listener.link); + wl_list_remove(&shell_output->destroy_listener.link); + wl_list_remove(&shell_output->link); + free(shell_output); } static void