summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2012-03-27 17:04:59 -0400
committerKristian Høgsberg <krh@bitplanet.net>2012-03-27 17:05:06 -0400
commit8cbfb2a40ac1e6b36f485f934c0b1d2270b8c427 (patch)
treedc3f0dde352159f0c9d2f369697a45dcf5bf456a
parent679f716088845c54fff3e0c9a9d318a3e9e94e2e (diff)
compositor: Rename weston_buffer_attach to weston_surface_attach
This was always an operation on the surface, not the buffer.
-rw-r--r--src/compositor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor.c b/src/compositor.c
index c738be0..8145a3e 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -671,7 +671,7 @@ weston_surface_destroy(struct weston_surface *surface)
}
static void
-weston_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface)
+weston_surface_attach(struct wl_surface *surface, struct wl_buffer *buffer)
{
struct weston_surface *es = (struct weston_surface *) surface;
struct weston_compositor *ec = es->compositor;
@@ -1160,7 +1160,7 @@ surface_attach(struct wl_client *client,
if (buffer_resource)
buffer = buffer_resource->data;
- weston_buffer_attach(buffer, &es->surface);
+ weston_surface_attach(&es->surface, buffer);
if (buffer && es->configure)
es->configure(es, sx, sy);
@@ -1878,7 +1878,7 @@ input_device_attach(struct wl_client *client,
if (buffer_resource)
buffer = buffer_resource->data;
- weston_buffer_attach(buffer, &device->sprite->surface);
+ weston_surface_attach(&device->sprite->surface, buffer);
if (!buffer)
return;