mirror of
https://github.com/brl/mutter.git
synced 2025-02-19 14:44:10 +00:00
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
This commit is contained in:
parent
7360aece74
commit
72ca2b218d
@ -26,6 +26,7 @@
|
|||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
#include "util-private.h"
|
#include "util-private.h"
|
||||||
|
#include <meta/main.h>
|
||||||
#include "session.h"
|
#include "session.h"
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
|
|
||||||
@ -532,6 +533,12 @@ die_callback (SmcConn smc_conn, SmPointer client_data)
|
|||||||
* Anything that wants us to go away outside of session management
|
* Anything that wants us to go away outside of session management
|
||||||
* can use kill().
|
* 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
|
static void
|
||||||
|
Loading…
x
Reference in New Issue
Block a user