[mutter] window: Change ordering of functions to match wayland branch

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

commit be352c2bf174c3ee569f7e0b51235094de800c54
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Feb 26 20:22:20 2014 -0500

    window: Change ordering of functions to match wayland branch
    
    ... and also change some unused public functions to be statics.

 src/core/window-private.h |    9 +--------
 src/core/window.c         |   22 +++++++++++-----------
 2 files changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 93e3e2d..b282efe 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -682,17 +682,10 @@ void meta_window_compute_tile_match (MetaWindow *window);
 
 gboolean meta_window_updates_are_frozen (MetaWindow *window);
 
-void meta_window_set_opaque_region        (MetaWindow     *window,
-                                           cairo_region_t *region);
 void meta_window_update_opaque_region_x11 (MetaWindow *window);
-
-void meta_window_set_input_region         (MetaWindow     *window,
-                                           cairo_region_t *region);
 void meta_window_update_input_region_x11  (MetaWindow *window);
-
-void meta_window_set_shape_region         (MetaWindow     *window,
-                                           cairo_region_t *region);
 void meta_window_update_shape_region_x11  (MetaWindow *window);
+
 void meta_window_set_opacity              (MetaWindow *window,
                                            guint       opacity);
 
diff --git a/src/core/window.c b/src/core/window.c
index 1a35a19..cc4e14d 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -7667,7 +7667,7 @@ meta_window_update_net_wm_type (MetaWindow *window)
   meta_window_recalc_window_type (window);
 }
 
-void
+static void
 meta_window_set_opaque_region (MetaWindow     *window,
                                cairo_region_t *region)
 {
@@ -7753,17 +7753,17 @@ region_create_from_x_rectangles (const XRectangle *rects,
   return cairo_region_create_rectangles (cairo_rects, n_rects);
 }
 
-void
-meta_window_set_shape_region (MetaWindow     *window,
+static void
+meta_window_set_input_region (MetaWindow     *window,
                               cairo_region_t *region)
 {
-  g_clear_pointer (&window->shape_region, cairo_region_destroy);
+  g_clear_pointer (&window->input_region, cairo_region_destroy);
 
   if (region != NULL)
-    window->shape_region = cairo_region_reference (region);
+    window->input_region = cairo_region_reference (region);
 
   if (window->display->compositor)
-    meta_compositor_update_shape_region (window->display->compositor, window);
+    meta_compositor_update_input_region (window->display->compositor, window);
 }
 
 void
@@ -7839,17 +7839,17 @@ meta_window_update_input_region_x11 (MetaWindow *window)
   cairo_region_destroy (region);
 }
 
-void
-meta_window_set_input_region (MetaWindow     *window,
+static void
+meta_window_set_shape_region (MetaWindow     *window,
                               cairo_region_t *region)
 {
-  g_clear_pointer (&window->input_region, cairo_region_destroy);
+  g_clear_pointer (&window->shape_region, cairo_region_destroy);
 
   if (region != NULL)
-    window->input_region = cairo_region_reference (region);
+    window->shape_region = cairo_region_reference (region);
 
   if (window->display->compositor)
-    meta_compositor_update_input_region (window->display->compositor, window);
+    meta_compositor_update_shape_region (window->display->compositor, window);
 }
 
 void