More weston rename fixes

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);

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);

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

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,

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,

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