brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prefs: Adapt to re-addition of a separate visual-bell option

Browse Source 
Commit d0910da036 merged the visual-bell/visual-bell-type options,
but the change turned out too disruptive for gnome-control-center /
gnome-shell, so gsettings-desktop-schemas commit a5819b2a4e9 re-added
the separate option.
This commit is contained in:
Florian Müllner
2011-11-14 15:22:30 +01:00
parent 7ce7feeb2b
commit c5468ee391
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/bell.c
View File

@@ -283,9 +283,6 @@ bell_visual_notify (MetaDisplay *display,
case G_DESKTOP_VISUAL_BELL_FRAME_FLASH:
bell_flash_frame (display, xkb_ev); /* does nothing yet */
break;
case G_DESKTOP_VISUAL_BELL_NONE:
/* do nothing */
break;
}
}
@@ -293,8 +290,9 @@ void
meta_bell_notify (MetaDisplay *display,
XkbAnyEvent *xkb_ev)
{
/* flash something if appropriate */
bell_visual_notify (display, xkb_ev);
/* flash something */
if (meta_prefs_get_visual_bell ())
bell_visual_notify (display, xkb_ev);
#ifdef HAVE_LIBCANBERRA
if (meta_prefs_bell_is_audible ())