From 7265423411609c14ddb9e6643463b840afcaa09b Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 26 Feb 2003 06:42:57 +0000 Subject: 2003-02-26 Havoc Pennington * dbus/dbus-connection.c (dbus_connection_send_message_with_reply_and_block): fix crash where we ref'd the outgoing message instead of the returned reply * dbus/dbus-transport-unix.c (do_authentication): check read watch at the end of this function, so if we didn't need to read for authentication, we reinstall it for receiving messages * dbus/dbus-message.c (dbus_message_new_reply): allow replies to a NULL sender for peer-to-peer case * dbus/dbus-transport-unix.c (check_read_watch): handle !authenticated case correctly * glib/dbus-gmain.c: add support for DBusServer * dbus/dbus-server.c: add data slot support * glib/dbus-gmain.c (dbus_connection_setup_with_g_main): check return values and handle errors * dbus/dbus-dataslot.c: factor out the data slot stuff from DBusConnection * Doxyfile.in (INPUT): add glib subdir * glib/dbus-gmain.c (dbus_connection_setup_with_g_main): rename setup_with_g_main instead of hookup_with_g_main; write docs --- glib/dbus-glib.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'glib/dbus-glib.h') diff --git a/glib/dbus-glib.h b/glib/dbus-glib.h index b280e1b7..6d90df94 100644 --- a/glib/dbus-glib.h +++ b/glib/dbus-glib.h @@ -26,7 +26,8 @@ #include #include -void dbus_gthread_init (void); -void dbus_connection_hookup_with_g_main (DBusConnection *connection); +void dbus_gthread_init (void); +void dbus_connection_setup_with_g_main (DBusConnection *connection); +void dbus_server_setup_with_g_main (DBusServer *server); #endif /* DBUS_GLIB_H */ -- cgit