isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 19:10:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

x11/events: Use MetaContext to terminate instead of meta_quit()

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1861>
This commit is contained in:
Jonas Ådahl 2021-03-03 17:21:59 +01:00
parent e8af5fd398
commit 9523120241
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/x11/events.c
View File

@ -39,8 +39,8 @@
#include "core/meta-workspace-manager-private.h" #include "core/meta-workspace-manager-private.h"
#include "core/window-private.h" #include "core/window-private.h"
#include "core/workspace-private.h" #include "core/workspace-private.h"
#include "meta/main.h"
#include "meta/meta-backend.h" #include "meta/meta-backend.h"
#include "meta/meta-context.h"
#include "meta/meta-x11-errors.h" #include "meta/meta-x11-errors.h"
#include "x11/meta-startup-notification-x11.h" #include "x11/meta-startup-notification-x11.h"
#include "x11/meta-x11-display-private.h" #include "x11/meta-x11-display-private.h"
@ -1146,11 +1146,13 @@ static gboolean
close_display_idle_cb (gpointer user_data) close_display_idle_cb (gpointer user_data)
{ {
MetaX11Display *x11_display = META_X11_DISPLAY (user_data); MetaX11Display *x11_display = META_X11_DISPLAY (user_data);
MetaDisplay *display = x11_display->display;
MetaContext *context = meta_display_get_context (display);
meta_display_close (x11_display->display, meta_display_close (display,
x11_display->xselectionclear_timestamp); x11_display->xselectionclear_timestamp);
x11_display->display_close_idle = 0; x11_display->display_close_idle = 0;
meta_quit (META_EXIT_SUCCESS); meta_context_terminate (context);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }