From abe893d8eaf56ccedb7ce41c107c7618c3b199b6 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Tue, 18 Apr 2023 13:36:20 +0100
Subject: [PATCH] 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>
---
 compositor/main.c                 | 10 +++++-----
 compositor/text-backend.c         |  4 ++--
 compositor/weston-screenshooter.c |  3 +--
 compositor/weston.h               |  2 +-
 desktop-shell/shell.c             |  4 ++--
 ivi-shell/hmi-controller.c        |  4 ++--
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/compositor/main.c b/compositor/main.c
index 1ba04b68..35ef463d 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -485,7 +485,7 @@ process_handle_sigchld(struct wet_process *process, int status)
 }
 
 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 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,
 				  wayland_socket.fds) < 0) {
-		weston_log("weston_client_start: "
+		weston_log("wet_client_start: "
 			   "socketpair failed while launching '%s': %s\n",
 			   path, strerror(errno));
 		goto err;
@@ -526,9 +526,9 @@ weston_client_start(struct weston_compositor *compositor, const char *path)
 	client = wl_client_create(compositor->wl_display,
 				  wayland_socket.fds[0]);
 	if (!client) {
-		weston_log("weston_client_start: "
-			"wl_client_create failed while launching '%s'.\n",
-			path);
+		weston_log("wet_client_start: "
+			   "wl_client_create failed while launching '%s'.\n",
+			   path);
 		/* We have no way of killing the process, so leave it hanging */
 		goto out_sock;
 	}
diff --git a/compositor/text-backend.c b/compositor/text-backend.c
index 6b8325b1..ca0b3a7a 100644
--- a/compositor/text-backend.c
+++ b/compositor/text-backend.c
@@ -1006,8 +1006,8 @@ launch_input_method(void *data)
 		setenv("WESTON_KEYBOARD_SURFACE_TYPE", "overlay", 1);
 
 	text_backend->input_method.client =
-		weston_client_start(text_backend->compositor,
-				    text_backend->input_method.path);
+		wet_client_start(text_backend->compositor,
+				 text_backend->input_method.path);
 
 	if (!text_backend->input_method.client) {
 		weston_log("not able to start %s\n",
diff --git a/compositor/weston-screenshooter.c b/compositor/weston-screenshooter.c
index 6c401249..5499b3d0 100644
--- a/compositor/weston-screenshooter.c
+++ b/compositor/weston-screenshooter.c
@@ -69,8 +69,7 @@ screenshooter_binding(struct weston_keyboard *keyboard,
 		return;
 	}
 
-	shooter->client = weston_client_start(shooter->ec,
-					      screenshooter_exe);
+	shooter->client = wet_client_start(shooter->ec, screenshooter_exe);
 	free(screenshooter_exe);
 
 	if (!shooter->client)
diff --git a/compositor/weston.h b/compositor/weston.h
index de720e5a..dd0a6706 100644
--- a/compositor/weston.h
+++ b/compositor/weston.h
@@ -58,7 +58,7 @@ weston_client_launch(struct weston_compositor *compositor,
 		     wet_process_cleanup_func_t cleanup);
 
 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 *
 wet_get_config(struct weston_compositor *compositor);
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 440e9b85..a508c612 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4370,8 +4370,8 @@ launch_desktop_shell_process(void *data)
 {
 	struct desktop_shell *shell = data;
 
-	shell->child.client = weston_client_start(shell->compositor,
-						  shell->client);
+	shell->child.client = wet_client_start(shell->compositor,
+					       shell->client);
 
 	if (!shell->child.client) {
 		weston_log("not able to start %s\n", shell->client);
diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c
index f867d176..a7ed6626 100644
--- a/ivi-shell/hmi-controller.c
+++ b/ivi-shell/hmi-controller.c
@@ -2101,8 +2101,8 @@ launch_hmi_client_process(void *data)
 		(struct hmi_controller *)data;
 
 	hmi_ctrl->user_interface =
-		weston_client_start(hmi_ctrl->compositor,
-				    hmi_ctrl->hmi_setting->ivi_homescreen);
+		wet_client_start(hmi_ctrl->compositor,
+				 hmi_ctrl->hmi_setting->ivi_homescreen);
 
 	free(hmi_ctrl->hmi_setting->ivi_homescreen);
 }