[mutter/wayland: 6/6] Merge remote-tracking branch 'origin/master' into wayland

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

commit 0e098249b1fae0de3e084dcdb7e96d36be05cca1
Merge: 9a5f243 12d2e1f
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Aug 13 10:44:09 2013 -0400

    Merge remote-tracking branch 'origin/master' into wayland

 .gitignore                       |    1 -
 configure.ac                     |    8 -
 src/Makefile.am                  |   25 +-
 src/core/display.c               |   21 -
 src/core/keybindings-private.h   |    1 -
 src/core/keybindings.c           |   25 -
 src/core/main.c                  |    8 +-
 src/core/window-private.h        |    3 +
 src/core/window-props.c          |   30 +
 src/core/window.c                |   13 +-
 src/meta/atomnames.h             |    4 +-
 src/meta/preview-widget.h        |   87 ---
 src/meta/theme.h                 |    3 +-
 src/stock_delete.png             |  Bin 220 -> 0 bytes
 src/stock_maximize.png           |  Bin 166 -> 0 bytes
 src/stock_minimize.png           |  Bin 145 -> 0 bytes
 src/tools/.cvsignore             |    8 -
 src/tools/Makefile.am            |   34 -
 src/tools/mutter-grayscale.c     |  107 ---
 src/tools/mutter-mag.c           |  299 ---------
 src/tools/mutter-message.c       |  160 -----
 src/tools/mutter-window-demo.c   | 1049 -----------------------------
 src/tools/mutter-window-demo.png |  Bin 3453 -> 0 bytes
 src/ui/menu.c                    |   55 +-
 src/ui/menu.h                    |    5 -
 src/ui/preview-widget.c          |  496 --------------
 src/ui/theme-viewer.c            | 1365 --------------------------------------
 src/ui/theme.c                   |    6 +-
 src/ui/ui.c                      |   53 +--
 src/ui/ui.h                      |    3 +-
 src/wm-tester/.cvsignore         |    7 -
 src/wm-tester/Makefile.am        |   33 -
 src/wm-tester/focus-window.c     |   37 -
 src/wm-tester/main.c             |  245 -------
 src/wm-tester/test-attached.c    |  100 ---
 src/wm-tester/test-focus.c       |  362 ----------
 src/wm-tester/test-gravity.c     |  308 ---------
 src/wm-tester/test-resizing.c    |  257 -------
 src/wm-tester/test-size-hints.c  |  136 ----
 39 files changed, 80 insertions(+), 5274 deletions(-)
---
diff --cc configure.ac
index 993c775,9baf35b..fd3c455
--- a/configure.ac
+++ b/configure.ac
@@@ -482,13 -433,9 +476,11 @@@ doc/man/Makefil
  doc/reference/Makefile
  doc/reference/meta-docs.sgml
  src/Makefile
- src/wm-tester/Makefile
  src/libmutter.pc
  src/mutter-plugins.pc
- src/tools/Makefile
  src/compositor/plugins/Makefile
 +protocol/Makefile
 +data/Makefile
  po/Makefile.in
  ])
  
diff --cc src/Makefile.am
index 6fed47b,5a20ef1..1c0ac25
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -170,28 -156,8 +169,26 @@@ libmutter_la_SOURCES =                           
        meta/theme.h                            \
        ui/theme-private.h                      \
        ui/ui.c                                 \
-       meta/preview-widget.h                   \
-       ui/preview-widget.c                     \
        $(mutter_built_sources)
  
 +if HAVE_WAYLAND
 +libmutter_la_SOURCES +=                               \
 +      wayland/meta-wayland.c                  \
 +      wayland/meta-wayland-private.h          \
 +      wayland/meta-xwayland-private.h         \
 +      wayland/meta-xwayland.c                 \
 +      wayland/meta-wayland-data-device.c      \
 +      wayland/meta-wayland-data-device.h      \
 +      wayland/meta-wayland-keyboard.c         \
 +      wayland/meta-wayland-keyboard.h         \
 +      wayland/meta-wayland-pointer.c          \
 +      wayland/meta-wayland-pointer.h          \
 +      wayland/meta-wayland-seat.c             \
 +      wayland/meta-wayland-seat.h             \
 +      wayland/meta-wayland-stage.h            \
 +      wayland/meta-wayland-stage.c
 +endif
 +
  libmutter_la_LDFLAGS = -no-undefined
  libmutter_la_LIBADD  = $(MUTTER_LIBS)