compositor: Parse config file in main(), only keep weston config object
Now that all backends and modules have been converted to the new
config parser API, we don't have to keep the fd around.
diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index be7b13e..279f1b3 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -1508,7 +1508,8 @@
int fullscreen,
int no_input,
int use_pixman,
- int *argc, char *argv[], int config_fd)
+ int *argc, char *argv[],
+ struct weston_config *config)
{
struct x11_compositor *c;
struct x11_output *output;
@@ -1528,8 +1529,7 @@
memset(c, 0, sizeof *c);
- if (weston_compositor_init(&c->base, display, argc, argv,
- config_fd) < 0)
+ if (weston_compositor_init(&c->base, display, argc, argv, config) < 0)
goto err_free;
c->dpy = XOpenDisplay(NULL);
@@ -1654,7 +1654,7 @@
WL_EXPORT struct weston_compositor *
backend_init(struct wl_display *display, int *argc, char *argv[],
- int config_fd)
+ struct weston_config *config)
{
int fullscreen = 0;
int no_input = 0;
@@ -1675,5 +1675,5 @@
fullscreen,
no_input,
use_pixman,
- argc, argv, config_fd);
+ argc, argv, config);
}