Mercurial > pidgin

changeset 25265:2307f8124407

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only initialize dbus threading if glib threading is initialized. The idea is that anything that will encounter the side effect of other libraries using dbus from gthreads will have had to already initialize glib threading earlier. Fixes #7538
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 07 Jan 2009 04:04:05 +0000
parents 6a1f8309c805
children c72b77a638a1 6c269e0d99ae
files libpurple/dbus-server.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/dbus-server.c	Wed Jan 07 02:12:17 2009 +0000
+++ b/libpurple/dbus-server.c	Wed Jan 07 04:04:05 2009 +0000
@@ -803,7 +803,8 @@
 void
 purple_dbus_init(void)
 {
-	dbus_g_thread_init();
+	if (g_thread_supported())
+		dbus_g_thread_init();
 
 	purple_dbus_init_ids();