Pushed to gh next. - Scott
On Sun, Mar 10, 2013 at 7:37 AM, Philipp Brüschweiler <[email protected]> wrote: > --- > src/compositor.c | 1 - > src/compositor.h | 3 +-- > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/src/compositor.c b/src/compositor.c > index a2860fd..7df9658 100644 > --- a/src/compositor.c > +++ b/src/compositor.c > @@ -3497,7 +3497,6 @@ int main(int argc, char *argv[]) > sigaction(SIGSEGV, &segv_action, NULL); > segv_compositor = ec; > > - ec->option_idle_time = idle_time; > ec->idle_time = idle_time; > > setenv("WAYLAND_DISPLAY", socket_name, 1); > diff --git a/src/compositor.h b/src/compositor.h > index 4a0c1e3..5d939ab 100644 > --- a/src/compositor.h > +++ b/src/compositor.h > @@ -322,8 +322,7 @@ struct weston_compositor { > uint32_t state; > struct wl_event_source *idle_source; > uint32_t idle_inhibit; > - int option_idle_time; /* default timeout, s */ > - int idle_time; /* effective timeout, s */ > + int idle_time; /* timeout, s */ > > /* Repaint state. */ > struct wl_array vertices; > -- > 1.8.1.5 > > _______________________________________________ > wayland-devel mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
