downstream: backport ivi-shell wip-12: remove weston_surface_set_role() call

Not available in Weston 1.6 yet.

Change-Id: I03307c4f1eaee58debeeeceb6f8fab46c3a10dd9

diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index 476908a..597c1d3 100644 (file)
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -363,9 +363,13 @@ application_surface_create(struct wl_client *client,
                wl_resource_get_user_data(surface_resource);
        struct wl_resource *res;
 
-       if (weston_surface_set_role(weston_surface, "ivi_surface",
-                                   resource, IVI_APPLICATION_ERROR_ROLE) < 0)
+       if (weston_surface->configure) {
+               wl_resource_post_error(resource,
+                                      IVI_APPLICATION_ERROR_ROLE,
+                                      "surface->configure already "
+                                      "set");
                return;
+       }
 
        layout_surface = shell->ivi_layout->surface_create(weston_surface,
                                                    id_surface);