pidgin: 223c176b: Only initialize dbus threading if glib t...
datallah at pidgin.im
datallah at pidgin.im
Tue Jan 6 23:05:58 EST 2009
-----------------------------------------------------------------
Revision: 223c176b6a2db3f928afc1e5cebc7a735461ae26
Ancestor: 8e99bf9be800f9578d7e94cc4d522d435cfc80dd
Author: datallah at pidgin.im
Date: 2009-01-07T04:04:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/223c176b6a2db3f928afc1e5cebc7a735461ae26
Modified files:
libpurple/dbus-server.c
ChangeLog:
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
-------------- next part --------------
============================================================
--- libpurple/dbus-server.c 1bf310bcee72ec30df582a54698c92658f45e185
+++ libpurple/dbus-server.c 928adb74d3405c0d9d1ab5bed9e9fa875371f285
@@ -803,7 +803,8 @@ purple_dbus_init(void)
void
purple_dbus_init(void)
{
- dbus_g_thread_init();
+ if (g_thread_supported())
+ dbus_g_thread_init();
purple_dbus_init_ids();
More information about the Commits
mailing list