[mutter/wip/wayland-work: 10/13] wayland: die when gnome-session asks us to

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

commit c3125a363a374231e8e6fddbdecbe273ded83029
Author: Giovanni Campagna <gcampagn redhat com>
Date:   Wed Aug 21 15:59:16 2013 +0200

    wayland: die when gnome-session asks us to
    
    At logout, we want to die when gnome-session tells us. Previously,
    we were relying on the X server going down (killed by GDM at the
    end of the session), but we can't use that in wayland.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=706421

 src/core/session.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/src/core/session.c b/src/core/session.c
index 41f360f..30981d5 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -25,6 +25,8 @@
 
 #include <config.h>
 
+#include <meta/util.h>
+#include <meta/main.h>
 #include "session.h"
 #include <X11/Xatom.h>
 
@@ -531,6 +533,12 @@ die_callback (SmcConn smc_conn, SmPointer client_data)
    * Anything that wants us to go away outside of session management
    * can use kill().
    */
+
+  /* All of that is true - unless we're a wayland compositor. In which
+   * case the X server won't go down until we do, so we must die first.
+   */
+  if (meta_is_wayland_compositor ())
+    meta_quit (0);
 }
 
 static void