--- a/ChangeLog	Thu Dec 24 01:33:17 2009 +0000
+++ b/ChangeLog	Thu Dec 24 02:39:51 2009 +0000
@@ -1,3 +1,9 @@
+2009-12-24  Jerry Tan <[email protected]>
+
+	* patches/metacity-09-force-system-bell.diff
+	* base-specs/metacity.spec:
+	add patch to fix bug 6885862
+
 2009-12-23  Brian Cameron  <[email protected]>
 
 	* base-specs/gdm.spec, patches/gdm-19-trusted-extensions.diff: Rename

--- a/base-specs/metacity.spec	Thu Dec 24 01:33:17 2009 +0000
+++ b/base-specs/metacity.spec	Thu Dec 24 02:39:51 2009 +0000
@@ -40,6 +40,8 @@
 Patch7:       metacity-07-xfree-xinerama.diff
 # date:2009-10-16 owner:yippi type:bug bugzilla:587732 doo:10611
 Patch8:       metacity-08-no-save-setup-dlg.diff
+# date:2009-12-23 owner:jerrytan type:branding bugster:6885862
+Patch9:       metacity-09-force-system-bell.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -76,6 +78,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %ifos linux

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/metacity-09-force-system-bell.diff	Thu Dec 24 02:39:51 2009 +0000
@@ -0,0 +1,26 @@
+--- metacity-2.28.0/src/core/bell.c	2009-09-09 04:55:35.000000000 +0800
++++ /backup/jtan/bell.c	2009-12-23 17:18:47.623372430 +0800
+@@ -310,15 +310,20 @@
+ 
+       ca_proplist_destroy (p);
+ 
+-      if (res != CA_SUCCESS && res != CA_ERROR_DISABLED)
+-        {      
++      XkbForceBell(display->xdisplay, xkb_bell_event->percent);
++
++
++      //if (res != CA_SUCCESS && res != CA_ERROR_DISABLED)
++      //{      
+           /* ...and in case that failed we use the classic X11 bell. */
++	  /*
+           XkbForceDeviceBell (display->xdisplay, 
+                               xkb_bell_event->device, 
+                               xkb_bell_event->bell_class, 
+                               xkb_bell_event->bell_id, 
+                               xkb_bell_event->percent);
+-        }
++	  */
++       //}
+     }
+ }
+ #endif /* HAVE_XKB */