[mutter/xdg-shell: 1/3] wayland: Remove edges

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

commit 912a0abd26faec0ec962892e0ead7180e1452ebc
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Feb 7 17:23:17 2014 -0500

    wayland: Remove edges
    
    This is an upstream change to xdg-shell.

 protocol/xdg-shell.xml             |    1 -
 src/core/window.c                  |    4 +---
 src/wayland/meta-wayland-surface.c |    5 ++---
 src/wayland/meta-wayland-surface.h |    3 +--
 4 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/protocol/xdg-shell.xml b/protocol/xdg-shell.xml
index 4e5cff8..851b2ce 100644
--- a/protocol/xdg-shell.xml
+++ b/protocol/xdg-shell.xml
@@ -230,7 +230,6 @@
        in surface local coordinates.
       </description>
 
-      <arg name="edges" type="uint"/>
       <arg name="width" type="int"/>
       <arg name="height" type="int"/>
     </event>
diff --git a/src/core/window.c b/src/core/window.c
index ee29fd4..984b350 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4741,9 +4741,7 @@ meta_window_move_resize_internal (MetaWindow          *window,
           need_resize_client = TRUE;
           meta_wayland_surface_configure_notify (window->surface,
                                                  new_rect.width,
-                                                 new_rect.height,
-                                                 (dx != 0 ? WL_SHELL_SURFACE_RESIZE_LEFT : 0) |
-                                                 (dy != 0 ? WL_SHELL_SURFACE_RESIZE_TOP : 0));
+                                                 new_rect.height);
         }
       else
         {
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index c24645e..2920e2a 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -1434,12 +1434,11 @@ meta_wayland_init_shell (MetaWaylandCompositor *compositor)
 void
 meta_wayland_surface_configure_notify (MetaWaylandSurface *surface,
                                       int                 new_width,
-                                      int                 new_height,
-                                      int                 edges)
+                                      int                 new_height)
 {
   if (surface->xdg_surface.resource)
     xdg_surface_send_configure (surface->xdg_surface.resource,
-                                edges, new_width, new_height);
+                                new_width, new_height);
 }
 
 void
diff --git a/src/wayland/meta-wayland-surface.h b/src/wayland/meta-wayland-surface.h
index 3e1b297..1722013 100644
--- a/src/wayland/meta-wayland-surface.h
+++ b/src/wayland/meta-wayland-surface.h
@@ -108,8 +108,7 @@ MetaWaylandSurface *meta_wayland_surface_create (MetaWaylandCompositor *composit
                                                 guint32                version);
 void                meta_wayland_surface_configure_notify (MetaWaylandSurface *surface,
                                                           int                 width,
-                                                          int                 height,
-                                                          int                 edges);
+                                                          int                 height);
 
 void                meta_wayland_surface_focused_set (MetaWaylandSurface *surface);
 void                meta_wayland_surface_focused_unset (MetaWaylandSurface *surface);