summaryrefslogtreecommitdiff
path: root/src/wayland/meta-wayland-surface.h
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2015-08-28 12:15:21 +0800
committerJonas Ådahl <jadahl@gmail.com>2015-09-07 17:41:14 +0800
commit94513726dec6770d5109569fdd9f567f2ae18757 (patch)
treec374ed155201f6af7c6f49ff058751bf33219697 /src/wayland/meta-wayland-surface.h
parent0aa4c4d43e356d706bb4517bbb5c2626c29f0234 (diff)
downloadmutter-94513726dec6770d5109569fdd9f567f2ae18757.tar.gz
wayland: Clean up surface role assignment
Use a better name, use GNOME conventions for error handling, open code the client error reporting and send the error to the correct resource. wl_subcompositor doesn't have a role error yet, so continue use some other error. The only effect of this is error received in the client will be a bit confusing, it will still be disconnected. https://bugzilla.gnome.org/show_bug.cgi?id=754215
Diffstat (limited to 'src/wayland/meta-wayland-surface.h')
-rw-r--r--src/wayland/meta-wayland-surface.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/wayland/meta-wayland-surface.h b/src/wayland/meta-wayland-surface.h
index 25debefe5..7efb65f42 100644
--- a/src/wayland/meta-wayland-surface.h
+++ b/src/wayland/meta-wayland-surface.h
@@ -174,10 +174,8 @@ MetaWaylandSurface *meta_wayland_surface_create (MetaWaylandCompositor *composit
struct wl_resource *compositor_resource,
guint32 id);
-int meta_wayland_surface_set_role (MetaWaylandSurface *surface,
- MetaWaylandSurfaceRole role,
- struct wl_resource *error_resource,
- uint32_t error_code);
+gboolean meta_wayland_surface_assign_role (MetaWaylandSurface *surface,
+ MetaWaylandSurfaceRole role);
void meta_wayland_surface_set_window (MetaWaylandSurface *surface,
MetaWindow *window);