compositor: remove the weston_config field in weston_compositor
The config can now be retrieved with a new function defined in weston.h,
wet_get_config(weston_compositor*).
Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
diff --git a/src/main.c b/src/main.c
index 2251101..4e78e91 100644
--- a/src/main.c
+++ b/src/main.c
@@ -331,6 +331,12 @@
usys.version, usys.machine);
}
+WL_EXPORT struct weston_config *
+wet_get_config(struct weston_compositor *compositor)
+{
+ return weston_compositor_get_user_data(compositor);
+}
+
static const char xdg_error_message[] =
"fatal: environment variable XDG_RUNTIME_DIR is not set.\n";
@@ -831,7 +837,7 @@
const char *name,
struct weston_drm_backend_output_config *config)
{
- struct weston_config *wc = weston_compositor_get_user_data(c);
+ struct weston_config *wc = wet_get_config(c);
struct weston_config_section *section;
char *s;
int scale;
@@ -1496,7 +1502,6 @@
goto out;
}
- ec->config = config;
if (weston_compositor_init_config(ec, config) < 0)
goto out;