commit a0d2dde6cd31e60595b9cf5b8901a5b3e0fee0ab
author Jason Ekstrand <jason@jlekstrand.net> Fri Jun 14 10:08:01 2013 -0500
committer Kristian Høgsberg <krh@bitplanet.net> Fri Jun 14 16:51:20 2013 -0400
tree 816efa1419a973976439a748aa2fb331095cfa92
parent 44a3863a1770379eb5e53c442d6205c55b049546

output: Use wl_resource_get accessors for weston_output resources

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>

src/shell.c

diff --git a/src/shell.c b/src/shell.c
index 7660f15..a3b1b1f 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1717,7 +1717,7 @@
 	/* get the default output, if the client set it as NULL
 	   check whether the ouput is available */
 	if (output_resource)
-		shsurf->output = output_resource->data;
+		shsurf->output = wl_resource_get_user_data(output_resource);
 	else if (es->output)
 		shsurf->output = es->output;
 	else
@@ -1930,7 +1930,7 @@
 	struct weston_output *output;
 
 	if (output_resource)
-		output = output_resource->data;
+		output = wl_resource_get_user_data(output_resource);
 	else
 		output = NULL;
 
@@ -2449,7 +2449,7 @@
 
 	surface->configure = background_configure;
 	surface->configure_private = shell;
-	surface->output = output_resource->data;
+	surface->output = wl_resource_get_user_data(output_resource);
 	desktop_shell_send_configure(resource, 0,
 				     surface_resource,
 				     surface->output->width,
@@ -2483,7 +2483,7 @@
 
 	surface->configure = panel_configure;
 	surface->configure_private = shell;
-	surface->output = output_resource->data;
+	surface->output = wl_resource_get_user_data(output_resource);
 	desktop_shell_send_configure(resource, 0,
 				     surface_resource,
 				     surface->output->width,
@@ -3675,7 +3675,7 @@
 	struct desktop_shell *shell = wl_resource_get_user_data(resource);
 	struct weston_surface *surface =
 		wl_resource_get_user_data(surface_resource);
-	struct weston_output *output = output_resource->data;
+	struct weston_output *output = wl_resource_get_user_data(output_resource);
 
 	surface->configure = screensaver_configure;
 	surface->configure_private = shell;
@@ -3838,7 +3838,7 @@
 	wl_list_insert(&shell->input_panel.surfaces,
 		       &input_panel_surface->link);
 
-	input_panel_surface->output = output_resource->data;
+	input_panel_surface->output = wl_resource_get_user_data(output_resource);
 	input_panel_surface->panel = 0;
 }