Merge branch 'untrusted-beep' into 'master'

x11: Don't beep on untrusted displays

Closes 

See merge request 
This commit is contained in:
Matthias Clasen 2021-04-21 10:12:39 +00:00
commit 142984cbf7
2 changed files with 6 additions and 0 deletions

View File

@ -1795,6 +1795,9 @@ _gdk_x11_display_update_grab_info_ungrab (GdkDisplay *display,
static void
gdk_x11_display_beep (GdkDisplay *display)
{
if (!GDK_X11_DISPLAY (display)->trusted_client)
return;
#ifdef HAVE_XKB
XkbBell (GDK_DISPLAY_XDISPLAY (display), None, 0, None);
#else

View File

@ -4542,6 +4542,9 @@ gdk_x11_surface_beep (GdkSurface *surface)
display = GDK_SURFACE_DISPLAY (surface);
if (!GDK_X11_DISPLAY (display)->trusted_client)
return FALSE;
#ifdef HAVE_XKB
if (GDK_X11_DISPLAY (display)->use_xkb)
{