[gsettings-desktop-schemas] schemas: Re-add separate visual-bell option

[Bastien Nocera <hadess src gnome org>]

commit a5819b2a4e9183f99dfa2cdd98036c71cbf994b6
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Nov 14 14:05:06 2011 +0000

    schemas: Re-add separate visual-bell option
    
    As disabling the option would otherwise cause the fullscreen or frame
    flash selection to be lost.

 headers/gdesktop-enums.h                           |    1 -
 ....gnome.desktop.wm.preferences.gschema.xml.in.in |   19 ++++++++++++++-----
 schemas/wm-schemas.convert                         |    1 +
 3 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/headers/gdesktop-enums.h b/headers/gdesktop-enums.h
index 369b9a6..35c9779 100644
--- a/headers/gdesktop-enums.h
+++ b/headers/gdesktop-enums.h
@@ -134,7 +134,6 @@ typedef enum
 
 typedef enum
 {
-  G_DESKTOP_VISUAL_BELL_NONE,
   G_DESKTOP_VISUAL_BELL_FULLSCREEN_FLASH,
   G_DESKTOP_VISUAL_BELL_FRAME_FLASH,
 } GDesktopVisualBellType;
diff --git a/schemas/org.gnome.desktop.wm.preferences.gschema.xml.in.in b/schemas/org.gnome.desktop.wm.preferences.gschema.xml.in.in
index baeb3ca..06b7fa2 100644
--- a/schemas/org.gnome.desktop.wm.preferences.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.wm.preferences.gschema.xml.in.in
@@ -232,18 +232,27 @@
         to allow silent 'beeps'.
       </_description>
     </key>
+    <key name="visual-bell" type="b">
+      <default>false</default>
+      <_summary>Enable Visual Bell</_summary>
+      <_description>
+        Turns on a visual indication when an application or the system issues
+        a 'bell' or 'beep'; useful for the hard-of-hearing and for use
+        in noisy environments.
+      </_description>
+    </key>
     <key name="visual-bell-type"
          enum="org.gnome.desktop.GDesktopVisualBellType">
-      <default>'none'</default>
+      <default>'fullscreen-flash'</default>
       <_summary>Visual Bell Type</_summary>
       <_description>
         Tells the WM how to implement the visual indication that the
         system bell or another application 'bell' indicator has been rung.
 
-        Currently there are three valid values, "none", which disables
-        the visual bell, "fullscreen-flash", which causes a fullscreen
-        white-black flash, and "frame-flash" which causes the titlebar
-        of the application which sent the bell signal to flash.
+        Currently there are two valid values, "fullscreen-flash", which
+        causes a fullscreen white-black flash, and "frame-flash" which
+        causes the titlebar of the application which sent the bell signal
+        to flash.
 
         If the application which sent the bell is unknown (as is usually
         the case for the default "system beep"), the currently focused
diff --git a/schemas/wm-schemas.convert b/schemas/wm-schemas.convert
index 42a2626..893678c 100644
--- a/schemas/wm-schemas.convert
+++ b/schemas/wm-schemas.convert
@@ -16,6 +16,7 @@ titlebar-uses-system-font = /apps/metacity/general/titlebar_uses_system_font
 titlebar-font = /apps/metacity/general/titlebar_font
 num-workspaces = /apps/metacity/general/num_workspaces
 visual-bell = /apps/metacity/general/visual_bell
+visual-bell-type = /apps/metacity/general/visual_bell
 audible-bell = /apps/metacity/general/audible_bell
 visual-bell-type = /apps/metacity/general/visual_bell_type
 application-based = /apps/metacity/general/application_based