[mutter] display: Call grab_op_ended after actually ending the grab op

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

commit a2b2a7a26feee2d984942d6f2dc4d7bdaeb0cd22
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Nov 26 15:39:12 2014 -0800

    display: Call grab_op_ended after actually ending the grab op
    
    Otherwise, we'll still think we're resizing the window when we
    send out the configure, causing apps that care about that to get
    stuck in that state.

 src/core/display.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index 185452b..93ab972 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1953,6 +1953,11 @@ meta_display_end_grab_op (MetaDisplay *display,
   g_signal_emit (display, display_signals[GRAB_OP_END], 0,
                  display->screen, grab_window, grab_op);
 
+  /* We need to reset this early, since the
+   * meta_window_grab_op_ended callback relies on this being
+   * up to date. */
+  display->grab_op = META_GRAB_OP_NONE;
+
   if (display->event_route == META_EVENT_ROUTE_WINDOW_OP)
     {
       /* Clear out the edge cache */
@@ -1985,7 +1990,6 @@ meta_display_end_grab_op (MetaDisplay *display,
     }
 
   display->event_route = META_EVENT_ROUTE_NORMAL;
-  display->grab_op = META_GRAB_OP_NONE;
   display->grab_window = NULL;
   display->grab_tile_mode = META_TILE_NONE;
   display->grab_tile_monitor_number = -1;