From c2a28557111c3cfdb10f8a0cfdd495ffd70fa0a3 Mon Sep 17 00:00:00 2001 From: James Willcox Date: Thu, 24 Apr 2003 02:22:49 +0000 Subject: 2003-04-23 James Willcox * glib/dbus-glib.h: * glib/dbus-gmain.c: (add_timeout), (wakeup_main), (create_source), (dbus_connection_setup_with_g_main), (dbus_server_setup_with_g_main): * glib/test-dbus-glib.c: (main): * glib/test-thread-client.c: (main): * glib/test-thread-server.c: (new_connection_callback), (main): * tools/dbus-monitor.c: (main): Added a GMainContext argument to dbus_connection_setup_with_g_main() and dbus_server_setup_with_g_main(). --- glib/test-thread-server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'glib/test-thread-server.c') diff --git a/glib/test-thread-server.c b/glib/test-thread-server.c index 367a2b33..a92febf3 100644 --- a/glib/test-thread-server.c +++ b/glib/test-thread-server.c @@ -162,7 +162,7 @@ new_connection_callback (DBusServer *server, g_print ("new_connection_callback\n"); dbus_connection_ref (new_connection); - dbus_connection_setup_with_g_main (new_connection); + dbus_connection_setup_with_g_main (new_connection, NULL); data = thread_test_data_new (); @@ -238,7 +238,7 @@ main (int argc, char *argv[]) new_connection_callback, NULL, NULL); - dbus_server_setup_with_g_main (server); + dbus_server_setup_with_g_main (server, NULL); loop = g_main_loop_new (NULL, FALSE); g_main_run (loop); -- cgit