summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Gschwind <gschwind@gnu-log.net>2016-05-10 22:47:46 +0200
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2016-05-11 12:25:51 +0300
commit37c6a1f275f7fbc37035090c4f7af664dff7cae8 (patch)
tree465f99799af8bde52af02aa8c830c59f358d80fd
parent676841d617d9ec2165d703db59b8722f997456c9 (diff)
downloadweston-37c6a1f275f7fbc37035090c4f7af664dff7cae8.tar.gz
compositor-wayland: rename wayland_output_init_from_config
Rename wayland_output_init_from_config to weston_wayland_output_config_init to prepare the following patch : "compositor-wayland: move configuration parsing to weston" Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> [Pekka: drop a useless comment] Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-rw-r--r--src/compositor-wayland.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 4799f904..a6db5522 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -1092,10 +1092,10 @@ err_name:
}
static void
-wayland_output_init_from_config(struct weston_wayland_backend_output_config *output,
- struct weston_config_section *config_section,
- int option_width, int option_height,
- int option_scale)
+weston_wayland_output_config_init(struct weston_wayland_backend_output_config *output,
+ struct weston_config_section *config_section,
+ int option_width, int option_height,
+ int option_scale)
{
char *mode, *t, *str;
unsigned int slen;
@@ -2441,8 +2441,8 @@ load_wayland_backend_config(struct weston_compositor *compositor, int *argc,
if (!oc)
goto err_outputs;
- wayland_output_init_from_config(oc, section, width,
- height, scale);
+ weston_wayland_output_config_init(oc, section, width,
+ height, scale);
--count;
}