[PATCH weston 1/2] shell: Use weston_compositor_sleep() instead of setting DPMS state

Kristian Høgsberg hoegsberg at gmail.com
Fri Feb 22 05:06:02 PST 2013


On Fri, Feb 22, 2013 at 02:16:18PM +0200, Ander Conselvan de Oliveira wrote:
> This should have been changed when the weston_compositor_sleep() entry
> point was added.
> ---
>  src/shell.c |    5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)

Looks good, both applied.

Kristian

> diff --git a/src/shell.c b/src/shell.c
> index ed6f434..93b46e1 100644
> --- a/src/shell.c
> +++ b/src/shell.c
> @@ -2154,14 +2154,11 @@ handle_screensaver_sigchld(struct weston_process *proc, int status)
>  {
>  	struct desktop_shell *shell =
>  		container_of(proc, struct desktop_shell, screensaver.process);
> -	struct weston_output *output;
>  
>  	proc->pid = 0;
>  
>  	if (shell->locked)
> -		wl_list_for_each(output, &shell->compositor->output_list, link)
> -			if (output->set_dpms)
> -				output->set_dpms(output, WESTON_DPMS_STANDBY);
> +		weston_compositor_sleep(shell->compositor);
>  }
>  
>  static void
> -- 
> 1.7.10.4
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel


More information about the wayland-devel mailing list