Apply to trivial patches for bell/sound

- http://bugzilla.gnome.org/show_bug.cgi?id=593356
- http://bugzilla.gnome.org/show_bug.cgi?id=593355

0001-bell-increase-bell-rate-limit-from-1-s-to-1-100ms.patch

@@ -0,0 +1,34 @@
+From 6558e661d22d9c2a70df8ce4bddcea083e61c328 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 28 Aug 2009 05:43:14 +0200
+Subject: [PATCH] bell: increase bell rate limit from 1/s to 1/100ms
+
+Right now metacity issues only 1 bell event per second. This is
+feels buggy when triggering multiple alarm sounds in a terminal.
+
+This patch simple increases the limit to 1/100ms. 100ms is probably a
+good choice since the HIG recommends that all user reaction should
+happen within 100ms. With this applied pressing 'Left' in gnome-terminal
+feels much more responsive.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=498608
+---
+ src/core/display.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/core/display.c b/src/core/display.c
+index b1661e3..bf22a9e 100644
+--- a/src/core/display.c
++++ b/src/core/display.c
+@@ -2385,7 +2385,7 @@ event_callback (XEvent   *event,
+ 	    {
+ 	    case XkbBellNotify:
+               if (XSERVER_TIME_IS_BEFORE(display->last_bell_time,
+-                                         xkb_ev->time - 1000))
++                                         xkb_ev->time - 100))
+                 {
+                   display->last_bell_time = xkb_ev->time;
+                   meta_bell_notify (display, xkb_ev);
+-- 
+1.6.4
+

0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch

@@ -0,0 +1,42 @@
+From 84e14cd8587c470e925e2fbf1a5a13c63686bcd4 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 28 Aug 2009 05:38:17 +0200
+Subject: [PATCH] sound: ask libcanberra to cache alert/desktop switch sounds
+
+These sounds are good candidates for caching in the sound server, to
+save a bit of CPU and make reaction faster. Hence, tell libcanberra to
+cache them.
+---
+ src/core/bell.c      |    1 +
+ src/core/workspace.c |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/core/bell.c b/src/core/bell.c
+index 92d1dbd..676ebac 100644
+--- a/src/core/bell.c
++++ b/src/core/bell.c
+@@ -292,6 +292,7 @@ meta_bell_notify (MetaDisplay *display,
+       ca_proplist_create (&p);
+       ca_proplist_sets (p, CA_PROP_EVENT_ID, "bell-window-system");
+       ca_proplist_sets (p, CA_PROP_EVENT_DESCRIPTION, _("Bell event"));
++      ca_proplist_sets (p, CA_PROP_CANBERRA_CACHE_CONTROL, "permanent");
+ 
+       window = meta_display_lookup_x_window (display, xkb_bell_event->window);
+       if (!window && (display->focus_window) && (display->focus_window->frame))
+diff --git a/src/core/display.c b/src/core/display.c
+index 55c374a..b1661e3 100644
+diff --git a/src/core/workspace.c b/src/core/workspace.c
+index a0170a6..063f867 100644
+--- a/src/core/workspace.c
++++ b/src/core/workspace.c
+@@ -358,6 +358,7 @@ static void workspace_switch_sound(MetaWorkspace *from,
+   ca_context_play(ca_gtk_context_get(), 1,
+                   CA_PROP_EVENT_ID, e,
+                   CA_PROP_EVENT_DESCRIPTION, "Desktop switched",
++                  CA_PROP_CANBERRA_CACHE_CONTROL, "permanent",
+                   NULL);
+ 
+  finish:
+-- 
+1.6.4
+

metacity.spec

@@ -1,7 +1,7 @@
 Summary: Unobtrusive window manager
 Name: metacity
 Version: 2.27.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.27/metacity-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
@@ -10,6 +10,10 @@ Patch4: stop-spamming-xsession-errors.patch
 Patch5: dnd-keynav.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=588119
 Patch6: Should-set-RestartStyleHint-to-RestartIfRunning-when.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=593355
+Patch7: 0001-bell-increase-bell-rate-limit-from-1-s-to-1-100ms.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=593356
+Patch8: 0001-sound-ask-libcanberra-to-cache-alert-desktop-switch-.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -72,6 +76,8 @@ API. This package exists purely for technical reasons.
 %patch4 -p1 -b .stop-spamming-xsession-errors
 %patch5 -p1 -b .dnd-keynav
 %patch6 -p1 -b .restart-if-running
+%patch7 -p1 -b .bell
+%patch8 -p1 -b .sound-cache
 
 # force regeneration
 rm src/metacity.schemas
@@ -179,6 +185,11 @@ fi
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Fri Aug 28 2009 Lennart Poettering <lpoetter@redhat.com> - 2.27.0-6
+- Apply to trivial patches for bell/sound
+- http://bugzilla.gnome.org/show_bug.cgi?id=593356
+- http://bugzilla.gnome.org/show_bug.cgi?id=593355
+
 * Sat Aug 22 2009 Owen Taylor <otaylor@redhat.com> - 2.27.0-5
 - Add a fix for http://bugzilla.gnome.org/show_bug.cgi?id=588119,
   remove no-longer-needed no-lame-dialog patch