Pass config_file through to weston_compositor_init
This allows us to do config parsing there.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 688aa59..870c208 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -738,7 +738,7 @@
static struct weston_compositor *
wayland_compositor_create(struct wl_display *display,
int width, int height, const char *display_name,
- int argc, char *argv[])
+ int argc, char *argv[], const char *config_file)
{
struct wayland_compositor *c;
struct wl_event_loop *loop;
@@ -770,7 +770,8 @@
c->base.destroy = wayland_destroy;
/* Can't init base class until we have a current egl context */
- if (weston_compositor_init(&c->base, display, argc, argv) < 0)
+ if (weston_compositor_init(&c->base, display, argc, argv,
+ config_file) < 0)
return NULL;
create_border(c);
@@ -793,7 +794,8 @@
}
WL_EXPORT struct weston_compositor *
-backend_init(struct wl_display *display, int argc, char *argv[])
+backend_init(struct wl_display *display, int argc, char *argv[],
+ const char *config_file)
{
int width = 1024, height = 640;
char *display_name = NULL;
@@ -808,5 +810,5 @@
ARRAY_LENGTH(wayland_options), argc, argv);
return wayland_compositor_create(display, width, height, display_name,
- argc, argv);
+ argc, argv, config_file);
}