summaryrefslogtreecommitdiffstats
path: root/glib/dbus-glib.h
diff options
context:
space:
mode:
authorJames Willcox <jwillcox@gnome.org>2003-04-24 02:22:49 +0000
committerJames Willcox <jwillcox@gnome.org>2003-04-24 02:22:49 +0000
commitc2a28557111c3cfdb10f8a0cfdd495ffd70fa0a3 (patch)
tree4513f535a540487bbdedb4a6e9fa3e462584dd91 /glib/dbus-glib.h
parentda237031b3104ecdfe1f2df058179cda187fcbc8 (diff)
2003-04-23 James Willcox <jwillcox@gnome.org>
* 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().
Diffstat (limited to 'glib/dbus-glib.h')
-rw-r--r--glib/dbus-glib.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/glib/dbus-glib.h b/glib/dbus-glib.h
index 6d90df94..f92d729e 100644
--- a/glib/dbus-glib.h
+++ b/glib/dbus-glib.h
@@ -27,7 +27,9 @@
#include <glib.h>
void dbus_gthread_init (void);
-void dbus_connection_setup_with_g_main (DBusConnection *connection);
-void dbus_server_setup_with_g_main (DBusServer *server);
+void dbus_connection_setup_with_g_main (DBusConnection *connection,
+ GMainContext *context);
+void dbus_server_setup_with_g_main (DBusServer *server,
+ GMainContext *context);
#endif /* DBUS_GLIB_H */