summaryrefslogtreecommitdiff
path: root/ivi-shell/ivi-shell.c
diff options
context:
space:
mode:
authorMurray Calavera <murray.calavera@gmail.com>2015-06-10 21:16:02 +0000
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2015-06-11 12:20:46 +0300
commit9a51cd7d101c5447b13817507efed01f8a3baa63 (patch)
tree8dc9f024aa18275fdfffde1ab7b6e4a8029b8fd6 /ivi-shell/ivi-shell.c
parent2588124cc34018a39e22be3bcb171e66849e7f54 (diff)
move text_backend initialization into the shell plugin
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@gmail.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'ivi-shell/ivi-shell.c')
-rw-r--r--ivi-shell/ivi-shell.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index 4a688ccb..8f1c3ca5 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -423,6 +423,9 @@ module_init(struct weston_compositor *compositor,
if (input_panel_setup(shell) < 0)
goto out_settings;
+ if (text_backend_init(compositor) < 0)
+ goto out_settings;
+
if (wl_global_create(compositor->wl_display,
&ivi_application_interface, 1,
shell, bind_ivi_application) == NULL)