diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 95051f705..d5b48d7d0 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-13  Bastien Nocera  <hadess@hadess.net>
+
+	* gnome-settings-multimedia-keys.c: (acme_filter_events): let's
+	simplify some code
+
 Tue Jan 13 10:48:57 2004  Jonathan Blandford  <jrb@gnome.org>
 
 	* gnome-settings-daemon: Merge in acme.  We now have a variety of
diff --git a/gnome-settings-daemon/gnome-settings-multimedia-keys.c b/gnome-settings-daemon/gnome-settings-multimedia-keys.c
index 28630a640..9b86ca0e3 100644
--- a/gnome-settings-daemon/gnome-settings-multimedia-keys.c
+++ b/gnome-settings-daemon/gnome-settings-multimedia-keys.c
@@ -845,7 +845,7 @@ acme_filter_events (GdkXEvent *xevent, GdkEvent *event, gpointer data)
 	keycode = xev->xkey.keycode;
 	state = xev->xkey.state;
 
-	for (i = 0; i < HANDLED_KEYS; i++)
+	for (i = 0; i < PLAY_KEY; i++)
 	{
 		if (keys[i].key == NULL)
 			continue;
@@ -854,12 +854,6 @@ acme_filter_events (GdkXEvent *xevent, GdkEvent *event, gpointer data)
 				(state & USED_MODS) == keys[i].key->state)
 		{
 			switch (keys[i].key_type) {
-			case PLAY_KEY:
-			case PAUSE_KEY:
-			case STOP_KEY:
-			case PREVIOUS_KEY:
-			case NEXT_KEY:
-				return GDK_FILTER_CONTINUE;
 			case VOLUME_DOWN_KEY:
 			case VOLUME_UP_KEY:
 #ifdef USE_FBLEVEL