diff options
| author | Michael Biebl <biebl@debian.org> | 2011-11-12 01:36:16 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-11-12 01:36:16 +0100 |
| commit | 86f44a65ad7617c7445edeca287fd903fc491a15 (patch) | |
| tree | f50b2eccd9e376fead6b1a8c9e8cf7604a862e0c /src/main.c | |
| parent | d35bb563359e30a95af10733a424643f1b8e6edb (diff) | |
| parent | b436a68a20ff3114ded32a7a3d70cdd4954039f9 (diff) | |
Merge commit 'upstream/0.9.2.0'
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c index b7c0fd5a..12a0b893 100644 --- a/src/main.c +++ b/src/main.c @@ -563,9 +563,18 @@ main (int argc, char *argv[]) umask (022); g_type_init (); + +/* + * Threading is always enabled starting from GLib 2.31.0. + * See also http://developer.gnome.org/glib/2.31/glib-Deprecated-Thread-APIs.html. + */ +#if !GLIB_CHECK_VERSION (2,31,0) if (!g_thread_supported ()) g_thread_init (NULL); dbus_g_thread_init (); +#else + dbus_threads_init_default (); +#endif #ifndef HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS #error HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS not defined |