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 <pekka.paalanen@collabora.com>
This commit is contained in:
@@ -4868,19 +4868,19 @@ shell_output_changed_move_layer(struct desktop_shell *shell,
|
|||||||
static void
|
static void
|
||||||
handle_output_destroy(struct wl_listener *listener, void *data)
|
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);
|
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);
|
shell_for_each_layer(shell, shell_output_changed_move_layer, NULL);
|
||||||
|
|
||||||
if (output_listener->panel_surface)
|
if (shell_output->panel_surface)
|
||||||
wl_list_remove(&output_listener->panel_surface_listener.link);
|
wl_list_remove(&shell_output->panel_surface_listener.link);
|
||||||
if (output_listener->background_surface)
|
if (shell_output->background_surface)
|
||||||
wl_list_remove(&output_listener->background_surface_listener.link);
|
wl_list_remove(&shell_output->background_surface_listener.link);
|
||||||
wl_list_remove(&output_listener->destroy_listener.link);
|
wl_list_remove(&shell_output->destroy_listener.link);
|
||||||
wl_list_remove(&output_listener->link);
|
wl_list_remove(&shell_output->link);
|
||||||
free(output_listener);
|
free(shell_output);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|||||||
Reference in New Issue
Block a user