brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland-surface: Return after posting errors back to the client

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-11-25 18:15:03 -05:00
parent 644f3e1275
commit 52b48cfbef
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/wayland/meta-wayland-surface.c
View File

@ -767,9 +767,12 @@ get_xdg_surface (struct wl_client *client,
META_XDG_SURFACE_VERSION, META_XDG_SURFACE_VERSION,
&xdg_surface_interface, &xdg_surface_interface,
&meta_wayland_xdg_surface_interface)) &meta_wayland_xdg_surface_interface))
wl_resource_post_error (surface_resource, {
WL_DISPLAY_ERROR_INVALID_OBJECT, wl_resource_post_error (surface_resource,
"xdg_shell::get_xdg_surface already requested"); WL_DISPLAY_ERROR_INVALID_OBJECT,
"xdg_shell::get_xdg_surface already requested");
return;
}
surface->window = meta_window_new_for_wayland (meta_get_display (), surface); surface->window = meta_window_new_for_wayland (meta_get_display (), surface);
} }
@ -823,9 +826,12 @@ get_xdg_popup (struct wl_client *client,
META_XDG_POPUP_VERSION, META_XDG_POPUP_VERSION,
&xdg_popup_interface, &xdg_popup_interface,
&meta_wayland_xdg_popup_interface)) &meta_wayland_xdg_popup_interface))
wl_resource_post_error (surface_resource, {
WL_DISPLAY_ERROR_INVALID_OBJECT, wl_resource_post_error (surface_resource,
"xdg_shell::get_xdg_surface already requested"); WL_DISPLAY_ERROR_INVALID_OBJECT,
"xdg_shell::get_xdg_surface already requested");
return;
}
surface->window = meta_window_new_for_wayland (meta_get_display (), surface); surface->window = meta_window_new_for_wayland (meta_get_display (), surface);
surface->window->type = META_WINDOW_DROPDOWN_MENU; surface->window->type = META_WINDOW_DROPDOWN_MENU;
@ -894,9 +900,12 @@ get_gtk_surface (struct wl_client *client,
META_GTK_SURFACE_VERSION, META_GTK_SURFACE_VERSION,
&gtk_surface_interface, &gtk_surface_interface,
&meta_wayland_gtk_surface_interface)) &meta_wayland_gtk_surface_interface))
wl_resource_post_error (surface_resource, {
WL_DISPLAY_ERROR_INVALID_OBJECT, wl_resource_post_error (surface_resource,
"gtk_shell::get_gtk_surface already requested"); WL_DISPLAY_ERROR_INVALID_OBJECT,
"gtk_shell::get_gtk_surface already requested");
return;
}
} }
static const struct gtk_shell_interface meta_wayland_gtk_shell_interface = { static const struct gtk_shell_interface meta_wayland_gtk_shell_interface = {