From 9724b51750254ae8275f098857f3851d2d031d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 3 Jan 2012 14:35:49 -0500 Subject: [PATCH] More weston rename fixes --- clients/desktop-shell.c | 4 ++-- clients/tablet-shell.c | 2 +- clients/window.c | 24 +++++++++---------- src/shell.c | 4 ++-- src/tablet-shell.c | 4 ++-- ...ktop-shell.ini => weston-desktop-shell.ini | 2 +- ...ablet-shell.ini => weston-tablet-shell.ini | 0 7 files changed, 20 insertions(+), 20 deletions(-) rename wayland-desktop-shell.ini => weston-desktop-shell.ini (95%) rename wayland-tablet-shell.ini => weston-tablet-shell.ini (100%) diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c index 87053f65..f20e19a7 100644 --- a/clients/desktop-shell.c +++ b/clients/desktop-shell.c @@ -110,7 +110,7 @@ static const struct config_key launcher_config_keys[] = { }; static const struct config_section config_sections[] = { - { "wayland-desktop-shell", + { "desktop-shell", shell_config_keys, ARRAY_LENGTH(shell_config_keys) }, { "launcher", launcher_config_keys, ARRAY_LENGTH(launcher_config_keys), @@ -629,7 +629,7 @@ int main(int argc, char *argv[]) desktop_shell_set_background(desktop.shell, output->output, s); } - config_file = config_file_path("wayland-desktop-shell.ini"); + config_file = config_file_path("weston-desktop-shell.ini"); parse_config_file(config_file, config_sections, ARRAY_LENGTH(config_sections), &desktop); diff --git a/clients/tablet-shell.c b/clients/tablet-shell.c index c6912ba5..1fb5dd8a 100644 --- a/clients/tablet-shell.c +++ b/clients/tablet-shell.c @@ -348,7 +348,7 @@ int main(int argc, char *argv[]) "tablet_shell", 1); shell = tablet_shell_create(display, id); - config_file = config_file_path("wayland-tablet-shell.ini"); + config_file = config_file_path("weston-tablet-shell.ini"); parse_config_file(config_file, config_sections, ARRAY_LENGTH(config_sections), shell); diff --git a/clients/window.c b/clients/window.c index b031daad..aa5f48b2 100644 --- a/clients/window.c +++ b/clients/window.c @@ -658,18 +658,18 @@ display_create_surface_from_file(struct display *display, const char *filename; int hotspot_x, hotspot_y; } pointer_images[] = { - { DATADIR "/wayland/bottom_left_corner.png", 6, 30 }, - { DATADIR "/wayland/bottom_right_corner.png", 28, 28 }, - { DATADIR "/wayland/bottom_side.png", 16, 20 }, - { DATADIR "/wayland/grabbing.png", 20, 17 }, - { DATADIR "/wayland/left_ptr.png", 10, 5 }, - { DATADIR "/wayland/left_side.png", 10, 20 }, - { DATADIR "/wayland/right_side.png", 30, 19 }, - { DATADIR "/wayland/top_left_corner.png", 8, 8 }, - { DATADIR "/wayland/top_right_corner.png", 26, 8 }, - { DATADIR "/wayland/top_side.png", 18, 8 }, - { DATADIR "/wayland/xterm.png", 15, 15 }, - { DATADIR "/wayland/hand1.png", 18, 11 } + { DATADIR "/weston/bottom_left_corner.png", 6, 30 }, + { DATADIR "/weston/bottom_right_corner.png", 28, 28 }, + { DATADIR "/weston/bottom_side.png", 16, 20 }, + { DATADIR "/weston/grabbing.png", 20, 17 }, + { DATADIR "/weston/left_ptr.png", 10, 5 }, + { DATADIR "/weston/left_side.png", 10, 20 }, + { DATADIR "/weston/right_side.png", 30, 19 }, + { DATADIR "/weston/top_left_corner.png", 8, 8 }, + { DATADIR "/weston/top_right_corner.png", 26, 8 }, + { DATADIR "/weston/top_side.png", 18, 8 }, + { DATADIR "/weston/xterm.png", 15, 15 }, + { DATADIR "/weston/hand1.png", 18, 11 } }; static void diff --git a/src/shell.c b/src/shell.c index 0c214b0d..e2fd1e64 100644 --- a/src/shell.c +++ b/src/shell.c @@ -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, diff --git a/src/tablet-shell.c b/src/tablet-shell.c index b673a84b..51b259cc 100644 --- a/src/tablet-shell.c +++ b/src/tablet-shell.c @@ -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, diff --git a/wayland-desktop-shell.ini b/weston-desktop-shell.ini similarity index 95% rename from wayland-desktop-shell.ini rename to weston-desktop-shell.ini index 15ecedd5..65536772 100644 --- a/wayland-desktop-shell.ini +++ b/weston-desktop-shell.ini @@ -1,4 +1,4 @@ -[wayland-desktop-shell] +[desktop-shell] background-image=/usr/share/backgrounds/gnome/Aqua.jpg panel-color=0x90ff0000 locking=true diff --git a/wayland-tablet-shell.ini b/weston-tablet-shell.ini similarity index 100% rename from wayland-tablet-shell.ini rename to weston-tablet-shell.ini