diff --git a/ChangeLog b/ChangeLog
index e43f66c7a..97aeb6027 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-09  Elijah Newren  <newren@gmail.com>
+
+	* src/bell.c (meta_bell_notify_frame_destroy): Use the right
+	function to remove the timeout so that we don't crash if removed
+	at an inopportune time.  Fixes #322031.
+
 2006-01-09  Elijah Newren  <newren@gmail.com>
 
 	* src/edge-resistance.c (apply_edge_resistance): Remove the
diff --git a/src/bell.c b/src/bell.c
index cb1cf353f..1aefc77dd 100644
--- a/src/bell.c
+++ b/src/bell.c
@@ -252,5 +252,5 @@ void
 meta_bell_notify_frame_destroy (MetaFrame *frame)
 {
   if (frame->is_flashing) 
-    g_idle_remove_by_data (frame);
+    g_source_remove_by_funcs_user_data (&g_timeout_funcs, frame);
 }