From ead5242e0719d758b65465379f9b5be570426b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 1 Jan 2014 13:51:52 -0800 Subject: [PATCH] shell: Fix up previous broken commit --- desktop-shell/shell.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index b56f3978..2019a4ef 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -1971,10 +1971,11 @@ static struct wl_list * shell_surface_calculate_layer_link (struct shell_surface *shsurf) { struct workspace *ws; + struct weston_view *parent; switch (shsurf->type) { - case SHELL_SURFACE_POPUP: { - case SHELL_SURFACE_TOPLEVEL: { + case SHELL_SURFACE_POPUP: + case SHELL_SURFACE_TOPLEVEL: if (shsurf->state.fullscreen) { return &shsurf->shell->fullscreen_layer.view_list; } else if (shsurf->parent) { @@ -1982,7 +1983,6 @@ shell_surface_calculate_layer_link (struct shell_surface *shsurf) * that surfaces which are transient for * fullscreen surfaces don't get hidden by the * fullscreen surfaces. */ - struct weston_view *parent; /* TODO: Handle a parent with multiple views */ parent = get_default_view(shsurf->parent); @@ -1990,7 +1990,6 @@ shell_surface_calculate_layer_link (struct shell_surface *shsurf) return parent->layer_link.prev; } break; - } case SHELL_SURFACE_XWAYLAND: return &shsurf->shell->fullscreen_layer.view_list;