From 2f45e88f0609dcd2fc735b62c38c7144bb91423b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Sat, 19 Aug 2017 00:24:23 +0800 Subject: [PATCH] wayland/inhibit-shortcuts-dialog: Just hide the dialog when hiding The meta_wayland_surface_hide_inhibit_shortcuts_dialog() function disconnected the "destroy" handler, but we'd still be listening on response events. Change this to just hide the dialog, leaving the data intact with the proper life time signal in place. https://bugzilla.gnome.org/show_bug.cgi?id=786385 --- src/wayland/meta-wayland-inhibit-shortcuts-dialog.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/wayland/meta-wayland-inhibit-shortcuts-dialog.c b/src/wayland/meta-wayland-inhibit-shortcuts-dialog.c index aff067aef..5c3be7132 100644 --- a/src/wayland/meta-wayland-inhibit-shortcuts-dialog.c +++ b/src/wayland/meta-wayland-inhibit-shortcuts-dialog.c @@ -164,7 +164,10 @@ meta_wayland_surface_hide_inhibit_shortcuts_dialog (MetaWaylandSurface *surface) /* The closure notify will take care of actually hiding the dialog */ data = surface_inhibit_shortcuts_data_get (surface); - g_signal_handlers_disconnect_by_data (surface, data); + g_return_if_fail (data); + + if (data->dialog) + meta_inhibit_shortcuts_dialog_hide (data->dialog); } void