isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues 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
Show Stats 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: case G_DESKTOP_VISUAL_BELL_FRAME_FLASH:
bell_flash_frame (display, xkb_ev); /* does nothing yet */ bell_flash_frame (display, xkb_ev); /* does nothing yet */
break; break;
case G_DESKTOP_VISUAL_BELL_NONE:
/* do nothing */
break;
} }
} }
@ -293,8 +290,9 @@ void
meta_bell_notify (MetaDisplay *display, meta_bell_notify (MetaDisplay *display,
XkbAnyEvent *xkb_ev) XkbAnyEvent *xkb_ev)
{ {
/* flash something if appropriate */ /* flash something */
bell_visual_notify (display, xkb_ev); if (meta_prefs_get_visual_bell ())
bell_visual_notify (display, xkb_ev);
#ifdef HAVE_LIBCANBERRA #ifdef HAVE_LIBCANBERRA
if (meta_prefs_bell_is_audible ()) if (meta_prefs_bell_is_audible ())

14
src/core/prefs.c
View File

@ -88,6 +88,7 @@ static gboolean application_based = FALSE;
static gboolean disable_workarounds = FALSE; static gboolean disable_workarounds = FALSE;
static gboolean auto_raise = FALSE; static gboolean auto_raise = FALSE;
static gboolean auto_raise_delay = 500; static gboolean auto_raise_delay = 500;
static gboolean bell_is_visible = FALSE;
static gboolean bell_is_audible = TRUE; static gboolean bell_is_audible = TRUE;
static gboolean gnome_accessibility = FALSE; static gboolean gnome_accessibility = FALSE;
static gboolean gnome_animations = TRUE; static gboolean gnome_animations = TRUE;
@ -302,6 +303,13 @@ static MetaBoolPreference preferences_bool[] =
}, },
&auto_raise, &auto_raise,
}, },
{
{ "visual-bell",
SCHEMA_GENERAL,
META_PREF_VISUAL_BELL,
},
&bell_is_visible, /* FIXME: change the name: it's confusing */
},
{ {
{ "audible-bell", { "audible-bell",
SCHEMA_GENERAL, SCHEMA_GENERAL,
@ -1912,6 +1920,12 @@ meta_prefs_get_button_layout (MetaButtonLayout *button_layout_p)
*button_layout_p = button_layout; *button_layout_p = button_layout;
} }
gboolean
meta_prefs_get_visual_bell (void)
{
return bell_is_visible;
}
gboolean gboolean
meta_prefs_bell_is_audible (void) meta_prefs_bell_is_audible (void)
{ {

1
src/meta/prefs.h
View File

@ -268,6 +268,7 @@ void meta_prefs_get_window_binding (const char *name,
void meta_prefs_get_overlay_binding (MetaKeyCombo *combo); void meta_prefs_get_overlay_binding (MetaKeyCombo *combo);
gboolean meta_prefs_get_visible_bell (void);
gboolean meta_prefs_bell_is_audible (void); gboolean meta_prefs_bell_is_audible (void);
GDesktopVisualBellType meta_prefs_get_visual_bell_type (void); GDesktopVisualBellType meta_prefs_get_visual_bell_type (void);