Commit 9a51cd7d authored by Fulz's avatar Fulz Committed by Pekka Paalanen
Browse files

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: Fulz's avatarMurray Calavera <murray.calavera@gmail.com>
Reviewed-by: Pekka Paalanen's avatarPekka Paalanen <pekka.paalanen@collabora.co.uk>
parent 2588124c
......@@ -6676,6 +6676,9 @@ module_init(struct weston_compositor *ec,
if (input_panel_setup(shell) < 0)
return -1;
if (text_backend_init(ec) < 0)
return -1;
shell_configuration(shell);
shell->exposay.state_cur = EXPOSAY_LAYOUT_INACTIVE;
......
......@@ -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)
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment