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 /ivi-shell | |
| parent | fba27fbef2c5ed3e45299b5e950174f0d5f871aa (diff) | |
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 'ivi-shell')
| -rw-r--r-- | ivi-shell/hmi-controller.c | 6 | ||||
| -rw-r--r-- | ivi-shell/ivi-shell.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c index 094682c9..77278eeb 100644 --- a/ivi-shell/hmi-controller.c +++ b/ivi-shell/hmi-controller.c @@ -678,7 +678,7 @@ static struct hmi_server_setting * hmi_server_setting_create(struct weston_compositor *ec) { struct hmi_server_setting *setting = MEM_ALLOC(sizeof(*setting)); - struct weston_config *config = ec->config; + struct weston_config *config = wet_get_config(ec); struct weston_config_section *shell_section = NULL; shell_section = weston_config_get_section(config, "ivi-shell", @@ -1140,7 +1140,7 @@ ivi_hmi_controller_add_launchers(struct hmi_controller *hmi_ctrl, if (0 == y_count) y_count = 1; - config = hmi_ctrl->compositor->config; + config = wet_get_config(hmi_ctrl->compositor); if (!config) return; @@ -1881,7 +1881,7 @@ initialize(struct hmi_controller *hmi_ctrl) uint32_t *dest; }; - struct weston_config *config = hmi_ctrl->compositor->config; + struct weston_config *config = wet_get_config(hmi_ctrl->compositor); struct weston_config_section *section = NULL; int result = 0; int i = 0; diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c index 59ffe0c2..c1af78c2 100644 --- a/ivi-shell/ivi-shell.c +++ b/ivi-shell/ivi-shell.c @@ -46,6 +46,7 @@ #include "ivi-layout-export.h" #include "ivi-layout-shell.h" #include "shared/helpers.h" +#include "weston.h" /* Representation of ivi_surface protocol object. */ struct ivi_shell_surface @@ -416,7 +417,7 @@ ivi_shell_setting_create(struct ivi_shell_setting *dest, int *argc, char *argv[]) { int result = 0; - struct weston_config *config = compositor->config; + struct weston_config *config = wet_get_config(compositor); struct weston_config_section *section; const struct weston_option ivi_shell_options[] = { |