summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2017-08-19 00:24:23 +0800
committerJonas Ådahl <jadahl@gmail.com>2017-08-19 17:24:06 +0800
commit2f45e88f0609dcd2fc735b62c38c7144bb91423b (patch)
tree5e44255f77ec64e9adaf302b27b224619edc0c46
parentc1439e141e7a4b02c073b9ce1b659fc3d06b00d1 (diff)
downloadmutter-2f45e88f0609dcd2fc735b62c38c7144bb91423b.tar.gz
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
-rw-r--r--src/wayland/meta-wayland-inhibit-shortcuts-dialog.c5
1 files changed, 4 insertions, 1 deletions
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