isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-12 17:27:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

surface: Merge version logic inline

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-22 18:18:12 -04:00
parent 003ff3d255
commit 777a6d4570
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -594,13 +594,6 @@ destroy_surface_extension (MetaWaylandSurfaceExtension *extension)
extension->resource = NULL; extension->resource = NULL;
} }
static int
get_resource_version (struct wl_resource *master_resource,
int max_version)
{
return MIN (max_version, wl_resource_get_version (master_resource));
}
static gboolean static gboolean
create_surface_extension (MetaWaylandSurfaceExtension *extension, create_surface_extension (MetaWaylandSurfaceExtension *extension,
int max_version, int max_version,
@ -617,7 +610,8 @@ create_surface_extension (MetaWaylandSurfaceExtension *extension,
return FALSE; return FALSE;
client = wl_resource_get_client (surface->resource); client = wl_resource_get_client (surface->resource);
extension->resource = wl_resource_create (client, interface, get_resource_version (master_resource, max_version), id); extension->resource = wl_resource_create (client, interface,
MIN (max_version, wl_resource_get_version (master_resource)), id);
wl_resource_set_implementation (extension->resource, implementation, surface, destructor); wl_resource_set_implementation (extension->resource, implementation, surface, destructor);
return TRUE; return TRUE;