commit c1be8e59de2e68764da4790064f337e788dfaf89
author Daniel Stone <daniel@fooishbar.org> Fri Jun 01 11:14:02 2012 -0400
committer Kristian Høgsberg <krh@bitplanet.net> Fri Jun 01 11:14:38 2012 -0400
tree 01a169db44bd8cd841925fb201063959ac6fbd63
parent baf43592855c78b36dee33cb0d8e325388ae2dd5

Pass config_file through to weston_compositor_init

This allows us to do config parsing there.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

src/compositor-drm.c

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 5217c0e..500ea7c 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -1739,7 +1739,7 @@
 static struct weston_compositor *
 drm_compositor_create(struct wl_display *display,
 		      int connector, const char *seat, int tty,
-		      int argc, char *argv[])
+		      int argc, char *argv[], const char *config_file)
 {
 	struct drm_compositor *ec;
 	struct udev_enumerate *e;
@@ -1805,7 +1805,8 @@
 	ec->prev_state = WESTON_COMPOSITOR_ACTIVE;
 
 	/* Can't init base class until we have a current egl context */
-	if (weston_compositor_init(&ec->base, display, argc, argv) < 0)
+	if (weston_compositor_init(&ec->base, display, argc, argv,
+				   config_file) < 0)
 		return NULL;
 
 	for (key = KEY_F1; key < KEY_F9; key++)
@@ -1853,7 +1854,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 connector = 0, tty = 0;
 	const char *seat = default_seat;
@@ -1866,5 +1868,6 @@
 
 	parse_options(drm_options, ARRAY_LENGTH(drm_options), argc, argv);
 
-	return drm_compositor_create(display, connector, seat, tty, argc, argv);
+	return drm_compositor_create(display, connector, seat, tty, argc, argv,
+				     config_file);
 }