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

Fix clients to work with wl_ prefixed interface names

Browse Source
This commit is contained in:
Kristian Høgsberg 2011-04-20 18:53:07 -04:00
parent 025f7b8f8e
commit 7cbdb64ab6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/dnd.c
View File

@ -492,7 +492,7 @@ global_handler(struct display *display,
struct wl_drag_offer *offer;
struct dnd_offer *dnd_offer;
if (strcmp(interface, "drag_offer") != 0)
if (strcmp(interface, "wl_drag_offer") != 0)
return;
offer = wl_drag_offer_create(display_get_display(display), id, 1);

2
clients/simple-client.c
View File

@ -276,7 +276,7 @@ display_handle_global(struct wl_display *display, uint32_t id,
{
struct display *d = data;
if (strcmp(interface, "compositor") == 0)
if (strcmp(interface, "wl_compositor") == 0)
d->compositor = wl_compositor_create(display, id, 1);
}

12
clients/window.c
View File

@ -1646,19 +1646,19 @@ display_handle_global(struct wl_display *display, uint32_t id,
{
struct display *d = data;
if (strcmp(interface, "compositor") == 0) {
if (strcmp(interface, "wl_compositor") == 0) {
d->compositor = wl_compositor_create(display, id, 1);
} else if (strcmp(interface, "output") == 0) {
} else if (strcmp(interface, "wl_output") == 0) {
d->output = wl_output_create(display, id, 1);
wl_output_add_listener(d->output, &output_listener, d);
} else if (strcmp(interface, "input_device") == 0) {
} else if (strcmp(interface, "wl_input_device") == 0) {
display_add_input(d, id);
} else if (strcmp(interface, "shell") == 0) {
} else if (strcmp(interface, "wl_shell") == 0) {
d->shell = wl_shell_create(display, id, 1);
wl_shell_add_listener(d->shell, &shell_listener, d);
} else if (strcmp(interface, "shm") == 0) {
} else if (strcmp(interface, "wl_shm") == 0) {
d->shm = wl_shm_create(display, id, 1);
} else if (strcmp(interface, "selection_offer") == 0) {
} else if (strcmp(interface, "wl_selection_offer") == 0) {
add_selection_offer(d, id);
} else if (d->global_handler) {
d->global_handler(d, interface, id, version);