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.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 511a12da..d253d87a 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -721,7 +721,8 @@ wayland_destroy(struct weston_compositor *ec)
 static struct weston_compositor *
 wayland_compositor_create(struct wl_display *display,
 			  int width, int height, const char *display_name,
-			  int *argc, char *argv[], int config_fd)
+			  int *argc, char *argv[],
+			  struct weston_config *config)
 {
 	struct wayland_compositor *c;
 	struct wl_event_loop *loop;
@@ -734,7 +735,7 @@ wayland_compositor_create(struct wl_display *display,
 	memset(c, 0, sizeof *c);
 
 	if (weston_compositor_init(&c->base, display, argc, argv,
-				   config_fd) < 0)
+				   config) < 0)
 		goto err_free;
 
 	c->parent.wl_display = wl_display_connect(display_name);
@@ -797,7 +798,7 @@ err_free:
 
 WL_EXPORT struct weston_compositor *
 backend_init(struct wl_display *display, int *argc, char *argv[],
-	     int config_fd)
+	     struct weston_config *config)
 {
 	int width = 1024, height = 640;
 	char *display_name = NULL;
@@ -812,5 +813,5 @@ backend_init(struct wl_display *display, int *argc, char *argv[],
 		      ARRAY_LENGTH(wayland_options), argc, argv);
 
 	return wayland_compositor_create(display, width, height, display_name,
-					 argc, argv, config_fd);
+					 argc, argv, config);
 }