On Tue, Sep 25, 2012 at 01:52:43PM +0300, Tiago Vignatti wrote: > It's a quick fix in opposition of the lack of the two-stage module init. > Effectively it fix: > > https://bugs.freedesktop.org/show_bug.cgi?id=55259
No, the command line modules are supposed to load after the config file modules. I think the fix we're looking for is to just start the desktop-shell client in an idle handler, ie use wl_event_loop_add_idle() to install a handler that will be called once the event loop is running and call launch_desktop_shell_process() from there. Kristian > Signed-off-by: Tiago Vignatti <[email protected]> > --- > src/compositor.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/compositor.c b/src/compositor.c > index 8c8dff0..6ed9985 100644 > --- a/src/compositor.c > +++ b/src/compositor.c > @@ -3115,10 +3115,10 @@ int main(int argc, char *argv[]) > > setenv("WAYLAND_DISPLAY", socket_name, 1); > > - if (load_modules(ec, modules) < 0) > - goto out; > if (load_modules(ec, option_modules) < 0) > goto out; > + if (load_modules(ec, modules) < 0) > + goto out; > > if (wl_display_add_socket(display, socket_name)) { > weston_log("fatal: failed to add socket: %m\n"); > -- > 1.7.9.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
