[PATCH weston 2/2] Move text_backend initialization into the shell plugin

[Murray Calavera]

Whether a input method is used should be the responsibility
of the shell because some shells may not want to implement
an input method at all.

Signed-off-by: Murray Calavera <murray.calavera at gmail.com>
---
 desktop-shell/shell.c | 3 +++
 ivi-shell/ivi-shell.c | 3 +++
 src/compositor.c      | 2 --
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index fe620cb..a697d04 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -6719,6 +6719,9 @@ module_init(struct weston_compositor *ec,
 			     shell, bind_workspace_manager) == NULL)
 		return -1;
 
+	if (text_backend_init(ec) < 0)
+		return -1;
+
 	shell->child.deathstamp = weston_compositor_get_time();
 
 	shell->panel_position = DESKTOP_SHELL_PANEL_POSITION_TOP;
diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index 4a688cc..b70f1f4 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -428,6 +428,9 @@ module_init(struct weston_compositor *compositor,
 			     shell, bind_ivi_application) == NULL)
 		goto out_settings;
 
+	if (text_backend_init(compositor) < 0)
+		goto out_settings;
+
 	ivi_layout_init_with_compositor(compositor);
 
 	/* Call module_init of ivi-modules which are defined in weston.ini */
diff --git a/src/compositor.c b/src/compositor.c
index 8f02b4d..38c0775 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -4578,8 +4578,6 @@ weston_compositor_init(struct weston_compositor *ec,
 	weston_config_section_get_int(s, "repeat-delay",
 				      &ec->kb_repeat_delay, 400);
 
-	text_backend_init(ec);
-
 	wl_data_device_manager_init(ec->wl_display);
 
 	wl_display_init_shm(display);
-- 
2.4.2