More weston rename fixes

This commit is contained in:
Kristian Høgsberg
2012-01-03 14:35:49 -05:00
parent 82d9ee929b
commit 9724b51750
7 changed files with 20 additions and 20 deletions
+2 -2
View File
@@ -115,7 +115,7 @@ shell_configuration(struct wl_shell *shell)
{ "screensaver", saver_keys, ARRAY_LENGTH(saver_keys), NULL },
};
config_file = config_file_path("wayland-desktop-shell.ini");
config_file = config_file_path("weston-desktop-shell.ini");
ret = parse_config_file(config_file, cs, ARRAY_LENGTH(cs), shell);
free(config_file);
@@ -1122,7 +1122,7 @@ desktop_shell_sigchld(struct weston_process *process, int status)
static int
launch_desktop_shell_process(struct wl_shell *shell)
{
const char *shell_exe = LIBEXECDIR "/wayland-desktop-shell";
const char *shell_exe = LIBEXECDIR "/weston-desktop-shell";
shell->child.client = weston_client_launch(shell->compositor,
&shell->child.process,
+2 -2
View File
@@ -87,7 +87,7 @@ tablet_shell_sigchld(struct weston_process *process, int status)
shell->process.pid = 0;
fprintf(stderr,
"wayland-tablet-daemon crashed, exit code %d\n", status);
"weston-tablet-shell crashed, exit code %d\n", status);
}
static void
@@ -365,7 +365,7 @@ static const struct tablet_shell_interface tablet_shell_implementation = {
static void
launch_ux_daemon(struct tablet_shell *shell)
{
const char *shell_exe = LIBEXECDIR "/wayland-tablet-shell";
const char *shell_exe = LIBEXECDIR "/weston-tablet-shell";
shell->client = weston_client_launch(shell->compositor,
&shell->process,