gnome-games r8469 - trunk/libgames-support

[chpe svn gnome org]

Author: chpe
Date: Tue Jan  6 18:19:36 2009
New Revision: 8469
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8469&view=rev

Log:
Assert that GThread is initialised in GamesConf for HAVE_GNOME, since
GConf uses ORBit which needs this. See
http://mail.gnome.org/archives/desktop-devel-list/2008-December/msg00177.html
Needs to fix all the games later to actually init GThread.

Modified:
   trunk/libgames-support/games-conf.c

Modified: trunk/libgames-support/games-conf.c
==============================================================================
--- trunk/libgames-support/games-conf.c	(original)
+++ trunk/libgames-support/games-conf.c	Tue Jan  6 18:19:36 2009
@@ -531,6 +531,13 @@
                            "game-name", game_name,
                            NULL);
 
+#ifdef HAVE_GNOME
+  /* GConf uses ORBit2 which needs threads (but it's too late to call
+   * g_thread_init() here). See bug #547885.
+   */
+  g_assert (g_thread_supported ());
+#endif
+
   return !instance->priv->need_init;
 }
 
@@ -545,6 +552,7 @@
   g_assert (instance != NULL);
 
   g_object_unref (instance);
+  instance = NULL;
 }
 
 /**