diff options
| author | Giulio Camuffo <giuliocamuffo@gmail.com> | 2016-06-02 21:48:11 +0300 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2016-06-03 13:16:39 +0300 |
| commit | d52f3b775bf267b9c5313ab3ef65414a813ca51c (patch) | |
| tree | 0b928b22a50ecdc742880b6bc3ca5cdd0b3d3625 /xwayland | |
| parent | fba27fbef2c5ed3e45299b5e950174f0d5f871aa (diff) | |
| download | weston-d52f3b775bf267b9c5313ab3ef65414a813ca51c.tar.gz weston-d52f3b775bf267b9c5313ab3ef65414a813ca51c.tar.bz2 weston-d52f3b775bf267b9c5313ab3ef65414a813ca51c.zip | |
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>
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/launcher.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xwayland/launcher.c b/xwayland/launcher.c index db5e1d03..4fd25537 100644 --- a/xwayland/launcher.c +++ b/xwayland/launcher.c @@ -37,7 +37,7 @@ #include "xwayland.h" #include "shared/helpers.h" - +#include "weston.h" static int handle_sigusr1(int signal_number, void *data) @@ -60,6 +60,7 @@ weston_xserver_handle_event(int listen_fd, uint32_t mask, void *data) char display[8], s[8], abstract_fd[8], unix_fd[8], wm_fd[8]; int sv[2], wm[2], fd; char *xserver = NULL; + struct weston_config *config = wet_get_config(wxs->compositor); struct weston_config_section *section; if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sv) < 0) { @@ -98,7 +99,7 @@ weston_xserver_handle_event(int listen_fd, uint32_t mask, void *data) goto fail; snprintf(wm_fd, sizeof wm_fd, "%d", fd); - section = weston_config_get_section(wxs->compositor->config, + section = weston_config_get_section(config, "xwayland", NULL, NULL); weston_config_section_get_string(section, "path", &xserver, XSERVER_PATH); |