gcompris r3299 - in branches/gcomprixogoo: . src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Thu Mar 13 23:18:11 2008
New Revision: 3299
URL: http://svn.gnome.org/viewvc/gcompris?rev=3299&view=rev

Log:
	* src/gcompris/dbus.c: (gc_dbus_init): Fixed olpc trac bug#6363
	"GCompris won't start if settings are changed".
	Added support for gthread initialization in dbus startup if
	not yet done.
	This is a merge of gcomprixo r3298.



Modified:
   branches/gcomprixogoo/ChangeLog
   branches/gcomprixogoo/src/gcompris/dbus.c

Modified: branches/gcomprixogoo/src/gcompris/dbus.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/dbus.c	(original)
+++ branches/gcomprixogoo/src/gcompris/dbus.c	Thu Mar 13 23:18:11 2008
@@ -64,6 +64,8 @@
 
   g_type_init ();
 
+  if (!g_thread_supported ()) g_thread_init (NULL);
+
   dbus_g_thread_init ();
 
   error = NULL;