frontend: Rename weston_client_start to wet_client_start
It's not libweston, so it shouldn't be weston_. Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
parent
348465cd7a
commit
abe893d8ea
|
@ -485,7 +485,7 @@ process_handle_sigchld(struct wet_process *process, int status)
|
||||||
}
|
}
|
||||||
|
|
||||||
WL_EXPORT struct wl_client *
|
WL_EXPORT struct wl_client *
|
||||||
weston_client_start(struct weston_compositor *compositor, const char *path)
|
wet_client_start(struct weston_compositor *compositor, const char *path)
|
||||||
{
|
{
|
||||||
struct wet_process *proc;
|
struct wet_process *proc;
|
||||||
struct wl_client *client;
|
struct wl_client *client;
|
||||||
|
@ -501,7 +501,7 @@ weston_client_start(struct weston_compositor *compositor, const char *path)
|
||||||
|
|
||||||
if (os_socketpair_cloexec(AF_UNIX, SOCK_STREAM, 0,
|
if (os_socketpair_cloexec(AF_UNIX, SOCK_STREAM, 0,
|
||||||
wayland_socket.fds) < 0) {
|
wayland_socket.fds) < 0) {
|
||||||
weston_log("weston_client_start: "
|
weston_log("wet_client_start: "
|
||||||
"socketpair failed while launching '%s': %s\n",
|
"socketpair failed while launching '%s': %s\n",
|
||||||
path, strerror(errno));
|
path, strerror(errno));
|
||||||
goto err;
|
goto err;
|
||||||
|
@ -526,9 +526,9 @@ weston_client_start(struct weston_compositor *compositor, const char *path)
|
||||||
client = wl_client_create(compositor->wl_display,
|
client = wl_client_create(compositor->wl_display,
|
||||||
wayland_socket.fds[0]);
|
wayland_socket.fds[0]);
|
||||||
if (!client) {
|
if (!client) {
|
||||||
weston_log("weston_client_start: "
|
weston_log("wet_client_start: "
|
||||||
"wl_client_create failed while launching '%s'.\n",
|
"wl_client_create failed while launching '%s'.\n",
|
||||||
path);
|
path);
|
||||||
/* We have no way of killing the process, so leave it hanging */
|
/* We have no way of killing the process, so leave it hanging */
|
||||||
goto out_sock;
|
goto out_sock;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1006,8 +1006,8 @@ launch_input_method(void *data)
|
||||||
setenv("WESTON_KEYBOARD_SURFACE_TYPE", "overlay", 1);
|
setenv("WESTON_KEYBOARD_SURFACE_TYPE", "overlay", 1);
|
||||||
|
|
||||||
text_backend->input_method.client =
|
text_backend->input_method.client =
|
||||||
weston_client_start(text_backend->compositor,
|
wet_client_start(text_backend->compositor,
|
||||||
text_backend->input_method.path);
|
text_backend->input_method.path);
|
||||||
|
|
||||||
if (!text_backend->input_method.client) {
|
if (!text_backend->input_method.client) {
|
||||||
weston_log("not able to start %s\n",
|
weston_log("not able to start %s\n",
|
||||||
|
|
|
@ -69,8 +69,7 @@ screenshooter_binding(struct weston_keyboard *keyboard,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
shooter->client = weston_client_start(shooter->ec,
|
shooter->client = wet_client_start(shooter->ec, screenshooter_exe);
|
||||||
screenshooter_exe);
|
|
||||||
free(screenshooter_exe);
|
free(screenshooter_exe);
|
||||||
|
|
||||||
if (!shooter->client)
|
if (!shooter->client)
|
||||||
|
|
|
@ -58,7 +58,7 @@ weston_client_launch(struct weston_compositor *compositor,
|
||||||
wet_process_cleanup_func_t cleanup);
|
wet_process_cleanup_func_t cleanup);
|
||||||
|
|
||||||
struct wl_client *
|
struct wl_client *
|
||||||
weston_client_start(struct weston_compositor *compositor, const char *path);
|
wet_client_start(struct weston_compositor *compositor, const char *path);
|
||||||
|
|
||||||
struct weston_config *
|
struct weston_config *
|
||||||
wet_get_config(struct weston_compositor *compositor);
|
wet_get_config(struct weston_compositor *compositor);
|
||||||
|
|
|
@ -4370,8 +4370,8 @@ launch_desktop_shell_process(void *data)
|
||||||
{
|
{
|
||||||
struct desktop_shell *shell = data;
|
struct desktop_shell *shell = data;
|
||||||
|
|
||||||
shell->child.client = weston_client_start(shell->compositor,
|
shell->child.client = wet_client_start(shell->compositor,
|
||||||
shell->client);
|
shell->client);
|
||||||
|
|
||||||
if (!shell->child.client) {
|
if (!shell->child.client) {
|
||||||
weston_log("not able to start %s\n", shell->client);
|
weston_log("not able to start %s\n", shell->client);
|
||||||
|
|
|
@ -2101,8 +2101,8 @@ launch_hmi_client_process(void *data)
|
||||||
(struct hmi_controller *)data;
|
(struct hmi_controller *)data;
|
||||||
|
|
||||||
hmi_ctrl->user_interface =
|
hmi_ctrl->user_interface =
|
||||||
weston_client_start(hmi_ctrl->compositor,
|
wet_client_start(hmi_ctrl->compositor,
|
||||||
hmi_ctrl->hmi_setting->ivi_homescreen);
|
hmi_ctrl->hmi_setting->ivi_homescreen);
|
||||||
|
|
||||||
free(hmi_ctrl->hmi_setting->ivi_homescreen);
|
free(hmi_ctrl->hmi_setting->ivi_homescreen);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue