[mutter/gnome-41] core/close-dialog: Don't pass DISPLAY
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gnome-41] core/close-dialog: Don't pass DISPLAY
- Date: Wed, 24 Nov 2021 16:06:02 +0000 (UTC)
commit a1a8c7359cb72eeb529b93a1a87569f4ccd006b1
Author: Jonas Ådahl <jadahl gmail com>
Date: Mon Nov 8 10:37:52 2021 +0100
core/close-dialog: Don't pass DISPLAY
We set it via setenv(), and might not have the MetaX11Display at hand.
This fixes a crash when the stuck-client dialog (using zenity) appears
without any X1 client having appeared.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2081>
(cherry picked from commit 734ae26ff7d5d27cd223502af985ab0a1c8e29ed)
src/core/meta-close-dialog-default.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/src/core/meta-close-dialog-default.c b/src/core/meta-close-dialog-default.c
index 544a5b62d9..fb48e859bd 100644
--- a/src/core/meta-close-dialog-default.c
+++ b/src/core/meta-close-dialog-default.c
@@ -160,8 +160,7 @@ meta_close_dialog_default_show (MetaCloseDialog *dialog)
dialog_pid =
meta_show_dialog ("--question",
- window_content, NULL,
- window->display->x11_display->screen_name,
+ window_content, NULL, NULL,
_("_Force Quit"), _("_Wait"),
"face-sad-symbolic", window->xwindow,
NULL, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]