diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-01-29 09:43:56 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-01-29 09:43:56 +0000 |
| commit | 28098f2c7c23bdef9247c5dfbb8437ca3f03dac4 (patch) | |
| tree | f87cbac1f0a97c848f0450b6131350f273c98aa4 /dbus_glib_bindings | |
| parent | 8d0bc022242a89b1d31b2be0aa9e4d570179e3cc (diff) | |
Integrate dbus-gmain
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'dbus_glib_bindings')
| -rw-r--r-- | dbus_glib_bindings/module.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dbus_glib_bindings/module.c b/dbus_glib_bindings/module.c index 1da1ddb..ac05bca 100644 --- a/dbus_glib_bindings/module.c +++ b/dbus_glib_bindings/module.c @@ -25,8 +25,7 @@ #include <Python.h> #include <dbus/dbus-python.h> -#include <dbus/dbus-glib.h> -#include <dbus/dbus-glib-lowlevel.h> +#include <dbus-gmain/dbus-gmain.h> #ifdef PY3 PyMODINIT_FUNC PyInit__dbus_glib_bindings(void); @@ -49,7 +48,7 @@ dbus_py_glib_set_up_conn(DBusConnection *conn, void *data) { GMainContext *ctx = (GMainContext *)data; Py_BEGIN_ALLOW_THREADS - dbus_connection_setup_with_g_main(conn, ctx); + _dbus_py_glib_set_up_connection(conn, ctx); Py_END_ALLOW_THREADS return 1; } @@ -59,7 +58,7 @@ dbus_py_glib_set_up_srv(DBusServer *srv, void *data) { GMainContext *ctx = (GMainContext *)data; Py_BEGIN_ALLOW_THREADS - dbus_server_setup_with_g_main(srv, ctx); + _dbus_py_glib_set_up_server(srv, ctx); Py_END_ALLOW_THREADS return 1; } @@ -161,7 +160,7 @@ PyDoc_STRVAR(gthreads_init__doc__, static PyObject * gthreads_init (PyObject *always_null UNUSED, PyObject *no_args UNUSED) { - dbus_g_thread_init(); + dbus_threads_init_default(); Py_RETURN_NONE; } |