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

desktop-shell: Rename destroy_layer functions

Browse Source 
No functional change. Makes it obvious that we also call
weston_layer_fini().

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
(cherry picked from commit be5b6f9cdc)
dev
Marius Vlad 3 years ago
parent e34bb98299
commit 1d95c0992b
1 changed files with 9 additions and 9 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. 18
      desktop-shell/shell.c

18
desktop-shell/shell.c
Unescape View File

@ -883,7 +883,7 @@ animate_focus_change(struct desktop_shell *shell, struct workspace *ws,
} }
static void static void
desktop_shell_destroy_views_on_layer(struct weston_layer *layer); desktop_shell_destroy_layer(struct weston_layer *layer);
static void static void
workspace_destroy(struct workspace *ws) workspace_destroy(struct workspace *ws)
@ -898,7 +898,7 @@ workspace_destroy(struct workspace *ws)
if (ws->fsurf_back) if (ws->fsurf_back)
focus_surface_destroy(ws->fsurf_back); focus_surface_destroy(ws->fsurf_back);
desktop_shell_destroy_views_on_layer(&ws->layer); desktop_shell_destroy_layer(&ws->layer);
free(ws); free(ws);
} }
@ -4955,7 +4955,7 @@ setup_output_destroy_handler(struct weston_compositor *ec,
} }
static void static void
desktop_shell_destroy_views_on_layer(struct weston_layer *layer) desktop_shell_destroy_layer(struct weston_layer *layer)
{ {
struct weston_view *view, *view_next; struct weston_view *view, *view_next;
@ -5020,12 +5020,12 @@ shell_destroy(struct wl_listener *listener, void *data)
workspace_destroy(*ws); workspace_destroy(*ws);
wl_array_release(&shell->workspaces.array); wl_array_release(&shell->workspaces.array);
desktop_shell_destroy_views_on_layer(&shell->panel_layer); desktop_shell_destroy_layer(&shell->panel_layer);
desktop_shell_destroy_views_on_layer(&shell->background_layer); desktop_shell_destroy_layer(&shell->background_layer);
desktop_shell_destroy_views_on_layer(&shell->lock_layer); desktop_shell_destroy_layer(&shell->lock_layer);
desktop_shell_destroy_views_on_layer(&shell->input_panel_layer); desktop_shell_destroy_layer(&shell->input_panel_layer);
desktop_shell_destroy_views_on_layer(&shell->minimized_layer); desktop_shell_destroy_layer(&shell->minimized_layer);
desktop_shell_destroy_views_on_layer(&shell->fullscreen_layer); desktop_shell_destroy_layer(&shell->fullscreen_layer);
free(shell->client); free(shell->client);
free(shell); free(shell);

Write Preview
Loading…
Cancel
Save