[mutter/wip/wayland] Adds finalize function for meta-wayland

[Robert Bragg <rbragg src gnome org>]

commit 4371d236e47e7a8cfac307f4475c1773bc0d7f03
Author: Robert Bragg <robert linux intel com>
Date:   Thu Jan 12 18:53:10 2012 +0000

    Adds finalize function for meta-wayland
    
    This adds a meta_wayland_finalize() function that is called by
    meta_finalize() and currently used to call stop_xwayland().

 src/core/main.c                    |    2 ++
 src/wayland/meta-wayland-private.h |    1 +
 src/wayland/meta-wayland.c         |    6 ++++++
 3 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/src/core/main.c b/src/core/main.c
index 040840f..15c5c16 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -357,6 +357,8 @@ meta_finalize (void)
   if (display)
     meta_display_close (display,
                         CurrentTime); /* I doubt correct timestamps matter here */
+
+  meta_wayland_finalize ();
 }
 
 static int signal_pipe_fds[2] = { -1, -1 };
diff --git a/src/wayland/meta-wayland-private.h b/src/wayland/meta-wayland-private.h
index 30f895d..96e0aa6 100644
--- a/src/wayland/meta-wayland-private.h
+++ b/src/wayland/meta-wayland-private.h
@@ -128,6 +128,7 @@ struct _MetaWaylandCompositor
 };
 
 void                    meta_wayland_init                   (void);
+void                    meta_wayland_finalize               (void);
 
 /* We maintain a singleton MetaWaylandCompositor which can be got at via this
  * API after meta_wayland_init() has been called. */
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 9f28602..9b24b92 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -1215,6 +1215,12 @@ meta_wayland_init (void)
 }
 
 void
+meta_wayland_finalize (void)
+{
+  stop_xwayland (meta_wayland_compositor_get_default ());
+}
+
+void
 meta_wayland_handle_sig_child (void)
 {
   int status;