2003-03-13 Havoc Pennington <hp@redhat.com>

	* dbus/dbus-timeout.c (_dbus_timeout_list_set_functions): handle
	out of memory

	* dbus/dbus-watch.c (_dbus_watch_list_set_functions): handle out
	of memory

	* dbus/dbus-connection.h: Make AddWatchFunction and
	AddTimeoutFunction return a bool so they can fail on out-of-memory

	* bus/bus.c (bus_context_new): set up timeout handlers

	* bus/connection.c (bus_connections_setup_connection): set up
	timeout handlers

	* glib/dbus-gmain.c: adapt to the fact that set_functions stuff
	can fail

	* bus/bus.c (bus_context_new): adapt to changes

	* bus/connection.c: adapt to changes

	* test/watch.c: adapt to DBusWatch changes

	* bus/dispatch.c (bus_dispatch_test): started adding this but
	didn't finish

1 files changed, 22 insertions, 12 deletions

diff --git a/bus/loop.h b/bus/loop.h
index e2b5e50a..cd49865c 100644
--- a/bus/loop.h
+++ b/bus/loop.h
@@ -26,19 +26,29 @@
 
 #include <dbus/dbus.h>
 
-typedef void (* BusWatchFunction) (DBusWatch     *watch,
-                                   unsigned int   condition,
-                                   void          *data);
+typedef void (* BusWatchFunction)   (DBusWatch     *watch,
+                                     unsigned int   condition,
+                                     void          *data);
+typedef void (* BusTimeoutFunction) (DBusTimeout   *timeout,
+                                     void          *data);
+
+dbus_bool_t bus_loop_add_watch      (DBusWatch          *watch,
+                                     BusWatchFunction    function,
+                                     void               *data,
+                                     DBusFreeFunction    free_data_func);
+void        bus_loop_remove_watch   (DBusWatch          *watch,
+                                     BusWatchFunction    function,
+                                     void               *data);
+dbus_bool_t bus_loop_add_timeout    (DBusTimeout        *timeout,
+                                     BusTimeoutFunction  function,
+                                     void               *data,
+                                     DBusFreeFunction    free_data_func);
+void        bus_loop_remove_timeout (DBusTimeout        *timeout,
+                                     BusTimeoutFunction  function,
+                                     void               *data);
+void        bus_loop_run            (void);
+void        bus_loop_quit           (void);
 
-dbus_bool_t bus_loop_add_watch    (DBusWatch        *watch,
-                                   BusWatchFunction  function,
-                                   void             *data,
-                                   DBusFreeFunction  free_data_func);
-void        bus_loop_remove_watch (DBusWatch        *watch,
-                                   BusWatchFunction  function,
-                                   void             *data);
-void        bus_loop_run          (void);
-void        bus_loop_quit         (void);
 
 
 #endif /* BUS_LOOP_H */