[mutter/wip/tablet-protocol-v2: 86/149] wayland: Set an specific role on surfaces passed in wp_tablet_tool.set_cursor

[Carlos Garnacho <carlosg src gnome org>]

commit cd911584ebf51ad2b86caae55cae773cc43005ba
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu May 12 15:58:19 2016 +0200

    wayland: Set an specific role on surfaces passed in wp_tablet_tool.set_cursor
    
    This is now separated from the generic cursor one. This means that wl_surfaces
    can't be shared across wl_pointer and wp_tablet_tool. This is a change in
    tablet protocol v2.

 src/wayland/meta-wayland-tablet-tool.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/wayland/meta-wayland-tablet-tool.c b/src/wayland/meta-wayland-tablet-tool.c
index 2440648..0e8af8c 100644
--- a/src/wayland/meta-wayland-tablet-tool.c
+++ b/src/wayland/meta-wayland-tablet-tool.c
@@ -31,7 +31,7 @@
 #include <wayland-server.h>
 #include "tablet-unstable-v2-server-protocol.h"
 #include "meta-wayland-private.h"
-#include "meta-wayland-surface-role-cursor.h"
+#include "meta-wayland-surface-role-tablet-cursor.h"
 #include "meta-surface-actor-wayland.h"
 #include "meta-wayland-tablet.h"
 #include "meta-wayland-tablet-seat.h"
@@ -439,7 +439,7 @@ tool_set_cursor (struct wl_client   *client,
 
   if (surface &&
       !meta_wayland_surface_assign_role (surface,
-                                         META_TYPE_WAYLAND_SURFACE_ROLE_CURSOR))
+                                         META_TYPE_WAYLAND_SURFACE_ROLE_TABLET_CURSOR))
     {
       wl_resource_post_error (resource, WL_POINTER_ERROR_ROLE,
                               "wl_surface@%d already has a different role",