From 72ca2b218dc7b5b9fd70df0c4798c37527b58a6e Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Wed, 21 Aug 2013 15:59:16 +0200 Subject: [PATCH] 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/core/session.c b/src/core/session.c index 0d8be6bf3..6d435fd5c 100644 --- a/src/core/session.c +++ b/src/core/session.c @@ -26,6 +26,7 @@ #include #include "util-private.h" +#include #include "session.h" #include @@ -532,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