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

wayland: Remove superfluous "wayland_" from arguments

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-01-31 11:38:37 -05:00
parent 1a62ac9276
commit 225e20a898
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,28 +91,28 @@ surface_process_damage (MetaWaylandSurface *surface,
} }
static void static void
meta_wayland_surface_destroy (struct wl_client *wayland_client, meta_wayland_surface_destroy (struct wl_client *client,
struct wl_resource *wayland_resource) struct wl_resource *resource)
{ {
wl_resource_destroy (wayland_resource); wl_resource_destroy (resource);
} }
static void static void
meta_wayland_surface_attach (struct wl_client *wayland_client, meta_wayland_surface_attach (struct wl_client *client,
struct wl_resource *wayland_surface_resource, struct wl_resource *surface_resource,
struct wl_resource *wayland_buffer_resource, struct wl_resource *buffer_resource,
gint32 dx, gint32 dy) gint32 dx, gint32 dy)
{ {
MetaWaylandSurface *surface = MetaWaylandSurface *surface =
wl_resource_get_user_data (wayland_surface_resource); wl_resource_get_user_data (surface_resource);
MetaWaylandBuffer *buffer; MetaWaylandBuffer *buffer;
/* X11 unmanaged window */ /* X11 unmanaged window */
if (!surface) if (!surface)
return; return;
if (wayland_buffer_resource) if (buffer_resource)
buffer = meta_wayland_buffer_from_resource (wayland_buffer_resource); buffer = meta_wayland_buffer_from_resource (buffer_resource);
else else
buffer = NULL; buffer = NULL;
@ -588,7 +588,7 @@ meta_wayland_surface_resource_destroy_cb (struct wl_resource *resource)
MetaWaylandSurface * MetaWaylandSurface *
meta_wayland_surface_create (MetaWaylandCompositor *compositor, meta_wayland_surface_create (MetaWaylandCompositor *compositor,
struct wl_client *wayland_client, struct wl_client *client,
guint32 id, guint32 id,
guint32 version) guint32 version)
{ {
@ -596,9 +596,7 @@ meta_wayland_surface_create (MetaWaylandCompositor *compositor,
surface->compositor = compositor; surface->compositor = compositor;
surface->resource = wl_resource_create (wayland_client, surface->resource = wl_resource_create (client, &wl_surface_interface, version, id);
&wl_surface_interface,
version, id);
wl_resource_set_implementation (surface->resource, &meta_wayland_surface_interface, surface, wl_resource_set_implementation (surface->resource, &meta_wayland_surface_interface, surface,
meta_wayland_surface_resource_destroy_cb); meta_wayland_surface_resource_destroy_cb);