From 82a1d11cfaf501d198d194ed9b7e6c1c142c6152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 19 Jul 2012 14:02:00 -0400 Subject: [PATCH] shell: Set shell_interface.shell at initialization --- src/shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shell.c b/src/shell.c index fca280ef..344c6905 100644 --- a/src/shell.c +++ b/src/shell.c @@ -1748,7 +1748,6 @@ create_shell_surface(void *shell, struct weston_surface *surface, surface->configure = shell_surface_configure; surface->private = shsurf; - surface->compositor->shell_interface.shell = shell; shsurf->shell = (struct desktop_shell *) shell; shsurf->unresponsive = 0; @@ -3314,6 +3313,7 @@ shell_init(struct weston_compositor *ec) shell->hide_input_panel_listener.notify = hide_input_panels; wl_signal_add(&ec->hide_input_panel_signal, &shell->hide_input_panel_listener); ec->ping_handler = ping_handler; + ec->shell_interface.shell = shell; ec->shell_interface.create_shell_surface = create_shell_surface; ec->shell_interface.set_toplevel = set_toplevel; ec->shell_interface.set_transient = set_transient;