Revert unintentional merge from wip/surface-content to wayland

This reverts a lot of commits.
2014-01-22 09:16:56 -05:00
parent 59f79e8294
commit 20545941fa
23 changed files with 1141 additions and 1313 deletions
--- a/src/core/display.c
+++ b/src/core/display.c
@ -2777,7 +2777,7 @@ handle_other_xevent (MetaDisplay *display,

          if (display->grab_op != META_GRAB_OP_NONE &&
              display->grab_window == window &&
-              window->frame == NULL)
+              ((window->frame == NULL) || !window->frame->mapped))
            meta_display_end_grab_op (display, timestamp);

          if (!frame_was_receiver)