[mutter/wip/wayland] squash: Update the wl_compositor protocol version to 3

[Neil Roberts <nroberts src gnome org>]

commit 841118b04cf35d51b31de08b265583393ed7ca52
Author: Neil Roberts <neil linux intel com>
Date:   Wed Jul 24 17:14:48 2013 +0100

    squash: Update the wl_compositor protocol version to 3
    
    This just adds the set_buffer_scale request to wl_surface. Mutter
    doesn't currently do anything with this information but it at least
    lets GTK clients work.
    
    This should be squashed into the commit:
      “wayland: Adds basic hybrid X + Wayland support”

 src/wayland/meta-wayland.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 9422371..75afccc 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -402,6 +402,13 @@ meta_wayland_surface_set_buffer_transform (struct wl_client *client,
 {
 }
 
+static void
+meta_wayland_surface_set_buffer_scale (struct wl_client *client,
+                                       struct wl_resource *resource,
+                                       int scale)
+{
+}
+
 const struct wl_surface_interface meta_wayland_surface_interface = {
   meta_wayland_surface_destroy,
   meta_wayland_surface_attach,
@@ -410,7 +417,8 @@ const struct wl_surface_interface meta_wayland_surface_interface = {
   meta_wayland_surface_set_opaque_region,
   meta_wayland_surface_set_input_region,
   meta_wayland_surface_commit,
-  meta_wayland_surface_set_buffer_transform
+  meta_wayland_surface_set_buffer_transform,
+  meta_wayland_surface_set_buffer_scale
 };
 
 void
@@ -1757,7 +1765,7 @@ meta_wayland_init (void)
   wl_list_init (&compositor->frame_callbacks);
 
   if (!wl_global_create (compositor->wayland_display,
-                        &wl_compositor_interface, 1,
+                        &wl_compositor_interface, 3,
                         compositor, compositor_bind))
     g_error ("Failed to register wayland compositor object");