commit 0358af419b3fcce6764f4a57d3daf9bdce68cb12
author Giulio Camuffo <giuliocamuffo@gmail.com> Thu Jun 02 21:48:08 2016 +0300
committer Pekka Paalanen <pekka.paalanen@collabora.co.uk> Fri Jun 03 13:16:39 2016 +0300
tree ffafc0f0f9ad49d87bc21ebbaf6823cdc784261b
parent ca52b31d3f867d9a14b2a3b9fcd4f21aa5fb0a3d

Rename weston_compositor_xkb_init to weston_compositor_set_xkb_rule_names

weston_compositor_xkb_destroy() is called automatically so having only
weston_compositor_xkb_init() to be called by the user was a bit weird.
So rename it so that it makes more sense.
Also export it, since libweston compositors need to call it.

Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>

src/compositor.h

diff --git a/src/compositor.h b/src/compositor.h
index 0bbf458..c19f991 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -1537,8 +1537,8 @@
 void
 weston_seat_release(struct weston_seat *seat);
 int
-weston_compositor_xkb_init(struct weston_compositor *ec,
-			   struct xkb_rule_names *names);
+weston_compositor_set_xkb_rule_names(struct weston_compositor *ec,
+				     struct xkb_rule_names *names);
 void
 weston_compositor_xkb_destroy(struct weston_compositor *ec);
 

src/input.c

diff --git a/src/input.c b/src/input.c
index 8fe898c..08378d1 100644
--- a/src/input.c
+++ b/src/input.c
@@ -2277,9 +2277,9 @@
 }
 
 #ifdef ENABLE_XKBCOMMON
-int
-weston_compositor_xkb_init(struct weston_compositor *ec,
-			   struct xkb_rule_names *names)
+WL_EXPORT int
+weston_compositor_set_xkb_rule_names(struct weston_compositor *ec,
+				     struct xkb_rule_names *names)
 {
 	ec->use_xkbcommon = 1;
 
@@ -2442,9 +2442,9 @@
 	return 0;
 }
 #else
-int
-weston_compositor_xkb_init(struct weston_compositor *ec,
-			   struct xkb_rule_names *names)
+WL_EXPORT int
+weston_compositor_set_xkb_rule_names(struct weston_compositor *ec,
+				     struct xkb_rule_names *names)
 {
 	return 0;
 }

src/main.c

diff --git a/src/main.c b/src/main.c
index 475c1d0..39a13cf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -509,7 +509,7 @@
 	weston_config_section_get_string(s, "keymap_options",
 					 (char **) &xkb_names.options, NULL);
 
-	if (weston_compositor_xkb_init(ec, &xkb_names) < 0)
+	if (weston_compositor_set_xkb_rule_names(ec, &xkb_names) < 0)
 		return -1;
 
 	weston_config_section_get_int(s, "repeat-rate",