diff -urN dbus-glib-orig/dbus/dbus-gmain.c dbus-glib-patched/dbus/dbus-gmain.c
--- dbus-glib-orig/dbus/dbus-gmain.c    2009-09-01 17:09:06.919358522 -0400
+++ dbus-glib-patched/dbus/dbus-gmain.c 2009-09-01 18:32:46.203038866 -0400
@@ -591,14 +591,14 @@

   if (!dbus_connection_set_watch_functions (connection,
                                             add_watch,
-                                            remove_watch,
+                                            NULL,
                                             watch_toggled,
                                             cs, NULL))
     goto nomem;

   if (!dbus_connection_set_timeout_functions (connection,
                                               add_timeout,
-                                              remove_timeout,
+                                              NULL,
                                               timeout_toggled,
                                               cs, NULL))
     goto nomem;