mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More weston rename fixes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
clients/desktop-shell.c
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+12 -12
View File
@@ -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