isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-05 08:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Simplify global version management

Browse Source 
libwayland-server already checks the bounds of the bind for versioning,
meaning that the value that we pass to wl_global_create is all we need.
This commit is contained in:
Jasper St. Pierre
2014-08-04 10:24:59 -04:00
parent ab53c0e943
commit 75b6e917ad
5 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1133,7 +1133,7 @@ bind_xdg_shell (struct wl_client *client,
xdg_shell = g_slice_new (XdgShell);
xdg_shell->resource = wl_resource_create (client, &xdg_shell_interface, META_XDG_SHELL_VERSION, id);
xdg_shell->resource = wl_resource_create (client, &xdg_shell_interface, version, id);
wl_resource_set_implementation (xdg_shell->resource, &meta_wayland_xdg_shell_interface, data, NULL);
xdg_shell->client_destroy_listener.notify = xdg_shell_handle_client_destroy;
@@ -1385,8 +1385,7 @@ bind_wl_shell (struct wl_client *client,
{
struct wl_resource *resource;
resource = wl_resource_create (client, &wl_shell_interface,
MIN (META_WL_SHELL_VERSION, version), id);
resource = wl_resource_create (client, &wl_shell_interface, version, id);
wl_resource_set_implementation (resource, &meta_wayland_wl_shell_interface, data, NULL);
}
@@ -1463,8 +1462,7 @@ bind_gtk_shell (struct wl_client *client,
{
struct wl_resource *resource;
resource = wl_resource_create (client, &gtk_shell_interface,
MIN (META_GTK_SHELL_VERSION, version), id);
resource = wl_resource_create (client, &gtk_shell_interface, version, id);
wl_resource_set_implementation (resource, &meta_wayland_gtk_shell_interface, data, NULL);
/* FIXME: ask the plugin */
@@ -1749,8 +1747,7 @@ bind_subcompositor (struct wl_client *client,
{
struct wl_resource *resource;
resource = wl_resource_create (client, &wl_subcompositor_interface,
MIN (META_WL_SUBCOMPOSITOR_VERSION, version), id);
resource = wl_resource_create (client, &wl_subcompositor_interface, version, id);
wl_resource_set_implementation (resource, &meta_wayland_subcompositor_interface, data, NULL);
}