[mutter] wayland-surface: Rename the subsurface extension to wl_subsurface

[Jasper St. Pierre <jstpierre src gnome org>]

commit bc81736e6bc136dbdff3ce468a560477dd834af0
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Oct 6 20:19:45 2014 -0700

    wayland-surface: Rename the subsurface extension to wl_subsurface
    
    To match the interface name.

 src/wayland/meta-wayland-surface.c |   12 ++++++------
 src/wayland/meta-wayland-surface.h |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 811dad9..4658f95 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -463,7 +463,7 @@ commit_pending_state (MetaWaylandSurface      *surface,
     dnd_surface_commit (surface, pending);
   else if (surface->window)
     toplevel_surface_commit (surface, pending);
-  else if (surface->subsurface.resource)
+  else if (surface->wl_subsurface.resource)
     subsurface_surface_commit (surface, pending);
 
   g_list_foreach (surface->subsurfaces, parent_surface_committed, NULL);
@@ -654,7 +654,7 @@ surface_should_be_reactive (MetaWaylandSurface *surface)
     return TRUE;
 
   /* If we're a subsurface, we should be reactive */
-  if (surface->subsurface.resource)
+  if (surface->wl_subsurface.resource)
     return TRUE;
 
   return FALSE;
@@ -1542,7 +1542,7 @@ wl_subsurface_destructor (struct wl_resource *resource)
     }
 
   pending_state_destroy (&surface->sub.pending);
-  destroy_surface_extension (&surface->subsurface);
+  destroy_surface_extension (&surface->wl_subsurface);
 }
 
 static void
@@ -1668,7 +1668,7 @@ wl_subsurface_set_desync (struct wl_client *client,
   surface->sub.synchronous = FALSE;
 }
 
-static const struct wl_subsurface_interface meta_wayland_subsurface_interface = {
+static const struct wl_subsurface_interface meta_wayland_wl_subsurface_interface = {
   wl_subsurface_destroy,
   wl_subsurface_set_position,
   wl_subsurface_place_above,
@@ -1706,9 +1706,9 @@ wl_subcompositor_get_subsurface (struct wl_client *client,
   MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
   MetaWaylandSurface *parent = wl_resource_get_user_data (parent_resource);
 
-  if (!create_surface_extension (&surface->subsurface,
+  if (!create_surface_extension (&surface->wl_subsurface,
                                  &wl_subsurface_interface,
-                                 &meta_wayland_subsurface_interface,
+                                 &meta_wayland_wl_subsurface_interface,
                                  wl_subsurface_destructor,
                                  surface, resource, id))
     {
diff --git a/src/wayland/meta-wayland-surface.h b/src/wayland/meta-wayland-surface.h
index 9f67780..97c4fb1 100644
--- a/src/wayland/meta-wayland-surface.h
+++ b/src/wayland/meta-wayland-surface.h
@@ -96,7 +96,7 @@ struct _MetaWaylandSurface
   MetaWaylandSurfaceExtension xdg_popup;
   MetaWaylandSurfaceExtension wl_shell_surface;
   MetaWaylandSurfaceExtension gtk_surface;
-  MetaWaylandSurfaceExtension subsurface;
+  MetaWaylandSurfaceExtension wl_subsurface;
 
   /* xdg_surface stuff */
   struct wl_resource *xdg_shell_resource;