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.h

diff --git a/src/compositor.h b/src/compositor.h
index e00dfe3..23beb5f 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -624,7 +624,7 @@
 
 int
 weston_compositor_init(struct weston_compositor *ec, struct wl_display *display,
-		       int argc, char *argv[]);
+		       int argc, char *argv[], const char *config_file);
 void
 weston_compositor_shutdown(struct weston_compositor *ec);
 void
@@ -722,7 +722,8 @@
 weston_surface_destroy(struct weston_surface *surface);
 
 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
 weston_output_switch_mode(struct weston_output *output, struct weston_mode *mode);