[mutter] wayland: Rename pending_surface_state => pending

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

commit 2e2dd247ceccb84a9f67a25e2226b4f47f870d3c
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Apr 18 18:12:54 2014 -0400

    wayland: Rename pending_surface_state => pending
    
    This matches what's normally done.

 src/wayland/meta-wayland-surface.c |    8 ++++----
 src/wayland/meta-wayland-surface.h |   10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index e2c08b4..5962868 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -307,7 +307,7 @@ commit_pending_state (MetaWaylandSurface      *surface,
    */
   if (surface->sub.synchronous)
     {
-      move_pending_state (pending, &surface->sub.pending_surface_state);
+      move_pending_state (pending, &surface->sub.pending);
       return;
     }
 
@@ -1430,7 +1430,7 @@ subsurface_parent_surface_committed (MetaWaylandSurface *surface)
     }
 
   if (surface->sub.synchronous)
-    commit_pending_state (surface, &surface->sub.pending_surface_state);
+    commit_pending_state (surface, &surface->sub.pending);
 }
 
 static void
@@ -1455,7 +1455,7 @@ wl_subsurface_destructor (struct wl_resource *resource)
       surface->sub.parent = NULL;
     }
 
-  pending_state_destroy (&surface->sub.pending_surface_state);
+  pending_state_destroy (&surface->sub.pending);
   destroy_surface_extension (&surface->subsurface);
 }
 
@@ -1633,7 +1633,7 @@ wl_subcompositor_get_subsurface (struct wl_client *client,
       return;
     }
 
-  pending_state_init (&surface->sub.pending_surface_state);
+  pending_state_init (&surface->sub.pending);
   surface->sub.parent = parent;
   surface->sub.parent_destroy_listener.notify =
     surface_handle_parent_surface_destroyed;
diff --git a/src/wayland/meta-wayland-surface.h b/src/wayland/meta-wayland-surface.h
index b64fba2..24f1e7b 100644
--- a/src/wayland/meta-wayland-surface.h
+++ b/src/wayland/meta-wayland-surface.h
@@ -89,8 +89,16 @@ struct _MetaWaylandSurface
     MetaWaylandSurface *parent;
     struct wl_listener parent_destroy_listener;
 
+    /* When the surface is synchronous, its state will be applied
+     * when the parent is committed. This is done by moving the
+     * "real" pending state below to here when this surface is
+     * committed and in synchronous mode.
+     *
+     * When the parent surface is committed, we apply the pending
+     * state here.
+     */
     gboolean synchronous;
-    MetaWaylandPendingState pending_surface_state;
+    MetaWaylandPendingState pending;
 
     int32_t pending_x;
     int32_t pending_y;